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

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-qpr1-dev am: da4914d6 -s ours am: 87340e33 -s ours am: 093de6a9 -s ours am: 3902f5d1 -s ours am: cae054df -s ours am: 1faf21d0 -s ours

am skip reason: subject contains skip directive

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



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