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

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

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



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