[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: d3fe488a -s ours am: c2f19b0f -s ours

am skip reason: subject contains skip directive

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



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