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

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-dev am: e48d7291 -s ours am: 2d941b08 -s ours am: 99ae2106 -s ours am: b9ab54d7 -s ours am: 4dd7b2cf -s ours am: 1cb821ba -s ours am: 6008c615 -s ours am: 40a74a7b -s ours am: 10a0cf5e -s ours am: 2985b8ae -s ours am: 5c41a9ac -s ours am: 51ae293e -s ours

am skip reason: subject contains skip directive

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



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