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: 8a677d4a

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



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