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

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



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