Merge "Ensure state is set correctly after animateAppearOnLockscreen is...

Merge "Ensure state is set correctly after animateAppearOnLockscreen is called" into tm-qpr-dev am: 66f5377b am: 6bd6a90e

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



Change-Id: I69d92a99a30933450439ecb60b63dd0012a4b918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>