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: 8b320363 am: 8dd3355a am: b860de7f

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

Change-Id: I496553409675d1b9254ab7b2760de45e7e74d7fa