Merge "Remove unsupported per-app locales after the LocaleConfig override"...

Merge "Remove unsupported per-app locales after the LocaleConfig override" into udc-dev am: c7a4bee4

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



Change-Id: I7db5df917dfd0c335acb40d0f7731aa55c3fd1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>