Merge "Using different strings for language/region picker" into tm-qpr-dev am: ee666bae

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



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