Merge "Remove @CorePlatformApi LocaleData usage in frameworks" am: 3f89b904a8 am: 226e3d7641 am: 9ee26b06fb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1367376

Change-Id: I780aa8987d65a7d6f0e13fd7a88992310bf8967b