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

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

Change-Id: Ie753078d775f44e97d3e178b5dcac3b2964c852d