[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: cdbede64 -s ours am: ff6c98c1 -s ours am: ac22d32d -s ours am: e2a0b727 -s ours am: f4feb1e9 -s ours am: 373c2479 -s ours am: 531fe349 -s ours am: 29c1f42f -s ours

am skip reason: subject contains skip directive

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



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