[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into tm-qpr-dev am: 3dcb6e596a -s ours
am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 f2142c8067 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23174497
Change-Id: I1ddcedd7230a65d84cb07f78ec598922ebcf546e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: