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

Merge "Adding state description for current locale item" into tm-dev am: ba95ddf6 am: 20a5cafa am: 427897e1 am: ec563033

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



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