Merge "Synchronize access to mCurrentState when updating" into tm-dev am: 3137c78e am: 1dea7328 am: 67de5e5d

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



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