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

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

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



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