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

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



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