[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into tm-dev am: 9babf1a67a am: 83611643f2 -s ours am: e9265d45c5 -s ours am: 454ea4a709 -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: If215052d0f51970a1491a06febf4e2a59b533f5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: