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: 325704a7 am: 707598ab

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

Change-Id: I1b8fec5555603e7f771d8977bc8f20a11a80ac18