Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd am: e6bf1a83d8

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314

Change-Id: If94d8a65c9902180466481f157224a5389d9b117