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

[automerger skipped] Merge "Check URI permissions for resumable media artwork" into tm-dev am: 074556ad -s ours am: df79b909 -s ours

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

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



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