Merge "Merge "Adding state description for current locale item" into tm-dev am: ba95ddf6 am: f151b96d" into tm-d1-dev-plus-aosp am: 05c1ff77

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



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