Merge "Adding state description for current locale item" into tm-dev am: ba95ddf6 am: 20a5cafa am: 31284b04 am: 1c1e26bd

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



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