Merge "Avoid use of DateUtilsBridge.icuTimeZone()"