[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: 0f25ed87 -s ours am: e7e81fff -s ours am: 4bedceb9 -s ours am: 4030ae7d -s ours

am skip reason: subject contains skip directive

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



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