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" into tm-d1-dev-plus-aosp am: d75139de

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



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