[automerger skipped] Merge "Refreshing state in QS with upcoming state of...

[automerger skipped] Merge "Refreshing state in QS with upcoming state of KEYGUARD" into tm-qpr-dev am: bcc89a04 am: 29f20723 -s ours

am skip reason: Merged-In I0187f7bf0ee329d8f1ef7bb02bbcc5c69f14ec2a with SHA-1 4c57c3d6 is already in history

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



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