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

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



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