[automerger skipped] Merge "Using different strings for language/region...

[automerger skipped] Merge "Using different strings for language/region picker" into tm-qpr-dev am: ee666bae am: 6198fd99 -s ours

am skip reason: Merged-In I2edf82039b8dd37ca27ce831efa1cfa1474c8efb with SHA-1 817ad353 is already in history

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



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