Merge "[DO NOT MERGE] Use loadDrawableAsUser in MediaDataManager" am: dd1a016568 am: 2f163b2ba5

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

Change-Id: I1ff70e6a21c65a060cea25554ccc3d40402dda16