Merge "Merge "Fixed an issue where media could become invisible" into sc-dev...

Merge "Merge "Fixed an issue where media could become invisible" into sc-dev am: b1fe28e2 am: 32ca3c49" into sc-v2-dev-plus-aosp am: 7129746d

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

Change-Id: Ided916899a00b6d6f7f7d59158199f910f82047c