Merge "Support TimeZoneRulesManagerService in GSI" into oc-mr1-dev