Merge "Prevent squishing of the QsMediaHost when not in split shade" into tm-qpr-dev am: b9745ad64b am: 0eceb9e9e3

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

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