[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into tm-dev am: 9babf1a67a am: 83611643f2 -s ours

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

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

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