[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: a35f2dc5 -s ours am: d4c01f1d -s ours am: 2f26604a -s ours am: 02dc0569 -s ours am: ce552219 -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: I6d00da9f44e5141b82eb5d381a6e5ecdf2e60f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>