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

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



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