Merge "Move IcuZoneRulesProviderTest to external/icu"