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

Merge "Fixing broken shade after unfolding during expanding QS" into udc-dev am: cc0f84d2 am: 7279a2b9 am: 5f337ae4

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



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