Merge "Merge "Set current state key earlier and do not reset hasCurrentState" into rvc-dev am: 0e6be91f am: 773b8556 am: 9fbbda8c" into rvc-qpr-dev-plus-aosp am: 4e346600

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

Change-Id: Ia593287347f1b8f279301529154154f9075f9f20