Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest"