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

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

Change-Id: Ib23a5ff1491c89d5cd0f962b1f609c988111c18b