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

[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into tm-dev am: 9babf1a6 am: bbe1c4b3 -s ours am: bb398c88 -s ours am: ddb26e73 -s ours am: 23806c03 -s ours am: 78289118 -s ours am: ab621359 -s ours

am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 4ddfad25 is already in history

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



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