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

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



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