[automerger skipped] Enforce setCurrentState calls are on main thread am:...

[automerger skipped] Enforce setCurrentState calls are on main thread am: 6af74807 am: 81a29759 -s ours

am skip reason: Merged-In I569123ca240bec24f805ab87dfab25daf3545844 with SHA-1 033a5ef9 is already in history

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

Change-Id: I5ddc59125101aaa273df3b2ec40624b04b1b740f