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: I87ee0093cda11b61e41e062988e91c65532f3ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>