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

Merge "[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into tm-dev am: 9babf1a6 am: 83611643 -s ours am: e9265d45 -s ours am: 454ea4a7 -s ours" into udc-d1-dev-plus-aosp am: a2000d75 -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: Iaf0d9f1a1db24323183b842464c57d138e08e6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>