[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: c76d085f -s ours am: 4bea2c5f -s ours am: c980b03c -s ours am: 2ae5e3bb -s ours

am skip reason: subject contains skip directive

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



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