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

Merge "[automerger skipped] Merge "Check URI permissions for resumable media artwork" into udc-dev am: 80a36bf7 am: 0776a21a -s ours am: 0062109f -s ours" into udc-qpr-dev-plus-aosp am: 82c1548d -s ours

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

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



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