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

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

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