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: 3c74d1b4

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

Change-Id: Ia1ebdf81a07840f660c274b1c55e66be0317e7ab