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

[automerger skipped] Merge "DO NOT MERGE Verify URI permissions in MediaMetadata" into tm-dev am: ad697c41 am: 9d18fc95 -s ours am: 8a246404 -s ours am: 12355051 -s ours am: 18f324f6 -s ours am: f97ac66a -s ours

am skip reason: subject contains skip directive

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



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