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

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

Change-Id: Ia2ffdd6e4becf97d58f1a3c781ca9229e72a8b77