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 am: 9d4aa379

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



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