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

Merge "Fix using incorrect view in app language selection" into tm-dev am: fa264b81 am: ca005159 am: 2d12af96 am: 2ed75106

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



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