Merge "Refreshing state in QS with upcoming state of KEYGUARD" into tm-qpr-dev am: bcc89a04

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



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