[automerger skipped] Merge "Check URI permissions for resumable media artwork"...

[automerger skipped] Merge "Check URI permissions for resumable media artwork" into udc-dev-plus-aosp am: 72596e21 am: 4b6748bf -s ours am: a4499a72 -s ours

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

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



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