Merge "Adding state description for current locale item" into tm-dev am: ba95ddf6

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



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