Merge "Fix split shade issues when going from portrait expanded quick...

Merge "Fix split shade issues when going from portrait expanded quick settings" into tm-dev am: 0bad2dee

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

Change-Id: Ie28000146574ac25e89ec8ba71a8b0298a2619ee