Merge "Show check icon on current locale preference" into tm-dev am: 182dd36b

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



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