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 am: 1f931bc4 am: 426676df

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

Change-Id: I8efa706c2205de484e82583b30c45ef7804a07bf