Merge "Support TimeZoneRulesManagerService in GSI" into oc-mr1-dev
am: d0734551b7

Change-Id: I021d9c4e66bbc98f7bd8f0de2e714d32182663a0