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

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



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