Merge "Merge "Synchronize access to mCurrentState when updating" into tm-dev...

Merge "Merge "Synchronize access to mCurrentState when updating" into tm-dev am: 3137c78e am: 03e59253" into tm-d1-dev-plus-aosp am: 8a25fbda

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



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