Merge "Forcing closing QS when going from SHADE_LOCKED to KEYGUARD" into...

Merge "Forcing closing QS when going from SHADE_LOCKED to KEYGUARD" into tm-qpr-dev am: 0933f38b am: d11d52c8

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



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