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

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

Change-Id: Ib6bae04011ee7f40a42f0f44cb76f3053cf2648d