Merge "Update view when locale changes" into tm-dev am: 61fd8b95 am:...

Merge "Update view when locale changes" into tm-dev am: 61fd8b95 am: 60f39e8c am: 72ef6b43 am: 6d7e3215

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



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