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

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



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