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

[automerger skipped] Merge "Check URI permissions for resumable media artwork" into tm-d1-dev am: 1d67179c -s ours am: cdc220ab -s ours am: 68a9cd9f -s ours am: 13f0e3ad -s ours

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

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



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