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: f3c5d753

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

Change-Id: Ifb597cedb6daf07c1daa69e3a4a204849264a466