[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 am: 7213e92f -s ours am: 3f9d8cca -s ours am: fedf8ba8 -s ours am: 969b161a -s ours am: 02c37537 -s ours

am skip reason: subject contains skip directive

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



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