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: 03de4f06 am: 28c1ac38

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



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