Merge "Fixed a bug where the media entries are invisible after switching...

Merge "Fixed a bug where the media entries are invisible after switching users" into rvc-dev am: 402d7238 am: c566196d

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

Change-Id: Ic23179712bc81374da81dc7920156e5b21bb1658