Merge "Correctly show media player on split shade" into sc-v2-dev am: 55487ff5

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

Change-Id: I1ac6824387f8356d47d56076434e008d8236fa32