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

[automerger skipped] Merge "Check URI permissions for resumable media artwork" into udc-dev am: 80a36bf7 -s ours am: 892f1780 -s ours am: 1d4fa4c4 -s ours

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

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



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