Merge "Fixing empty split shade after rotation from expanded QS on lockscreen"...

Merge "Fixing empty split shade after rotation from expanded QS on lockscreen" into tm-qpr-dev am: 58bc0c4c am: c39acd23

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



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