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

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

Change-Id: Ic04cac39c009ec6acc362c8ef84fc52876535dd4