Merge "[Split shade] Fix QS showing briefly on AOD after turning off the...

Merge "[Split shade] Fix QS showing briefly on AOD after turning off the screen" into tm-qpr-dev am: 7c2915c4 am: edf2f739

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



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