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

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

Change-Id: I357d2a44be844f571f9dcc3f48b6f6849723bc76