Merge "Hiding split shade media container when not needed" into sc-dev am: 0f6b5c97 am: 22882f42

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

Change-Id: Ie303d6fc75683079e54ae3dad672a87262d4319c