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

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



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