Merge "Fixed an issue where media was transitioning oddly for split shade"...

Merge "Fixed an issue where media was transitioning oddly for split shade" into sc-dev am: c30bd1c9 am: 8969287a am: 40a27975

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

Change-Id: I45f1e94bec3386e7f33afae45ca1148f7f6161d6