Merge "Merge "Fix using incorrect view in app language selection" into tm-dev...

Merge "Merge "Fix using incorrect view in app language selection" into tm-dev am: fa264b81 am: 8a677d4a am: 17a7bb10" into tm-qpr-dev-plus-aosp am: 6d1fa231

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



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