Merge "Merge "Fixing broken shade after unfolding during expanding QS" into...

Merge "Merge "Fixing broken shade after unfolding during expanding QS" into udc-dev am: cc0f84d2 am: 03de4f06 am: 28c1ac38" into udc-qpr-dev-plus-aosp am: bfaed272

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



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