[automerger skipped] Merge "[DO NOT MERGE] Use loadDrawableAsUser in MediaDataManager" am: dd1a016568 am: 2f163b2ba5 am: 46ecb67146 am: d2334491b2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4f514dfa93b2e06dc872a8f2d8fd4cbed2af112f