Merge "Set current state key earlier and do not reset hasCurrentState" into...

Merge "Set current state key earlier and do not reset hasCurrentState" into rvc-dev am: 0e6be91f am: 773b8556 am: 6cc9f92b am: 73b9c4f8

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

Change-Id: Icb5ec9463436a65d9608f5dc2e569a29c3fa805b