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

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



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