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

[automerger skipped] Merge "Check URI permissions for resumable media artwork" into tm-qpr-dev am: e4a1d8f8 -s ours am: e4a27452 -s ours am: e4a8444b -s ours am: db7d9585 -s ours

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

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



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