[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for...

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b6 -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/+/24642267



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