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

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-qpr-dev am: 0103e314 -s ours am: f3e578fb -s ours am: 6e5dd607 -s ours

am skip reason: subject contains skip directive

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



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