Merge "Make sure to always fade the split shade media container" into sc-dev...

Merge "Make sure to always fade the split shade media container" into sc-dev am: 2ee855c3 am: 5c66e425 am: bb4d87c4

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

Change-Id: Id962615d8a5eebbbf236cef1a428605e40832ecb