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

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

Change-Id: Icb609826a05ba259c77401e476226b7f544c6c39