Merge "Only set locale in config for updating locale" into tm-qpr-dev am: b553c746 am: ada9d7ac

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



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