Merge "Fixing QS blinking when going from unlocked to AOD in split shade" into...

Merge "Fixing QS blinking when going from unlocked to AOD in split shade" into tm-qpr-dev am: 9a0ed1af

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



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