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 am: fdddbc69

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



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