[automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions in...

[automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions in MediaMetadata"" into tm-qpr-dev-plus-aosp am: 02634220 -s ours

am skip reason: subject contains skip directive

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



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