[automerger skipped] Merge "Check URI permissions for resumable media artwork" into tm-qpr-dev am: e4a1d8f87f -s ours am: e4a2745266 -s ours

am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 c13567e39c is already in history

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

Change-Id: Id0a04d69af913fb29d71497aa4e769f9d332c746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>