dissolved municipality in Uji district, Kyōto prefecture, Japan