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

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

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



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