[automerger skipped] Merge "Revert "Verify URI permissions in MediaMetadata""...

[automerger skipped] Merge "Revert "Verify URI permissions in MediaMetadata"" into tm-dev am: 3f7b95fc am: c3247ddf -s ours am: 5a66955f -s ours am: 3b2782ac -s ours am: 862148d6 -s ours

am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 4ddfad25 is already in history. Merged-In was found from reverted change.

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



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