Merge "Unbundle i18n API from android-non-updatable" am: 17e6d5b6a3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4b5abd79c1981b10e51b7c9dc6c879c0fcc8acb