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

[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into rvc-dev am: 02a632ff am: a2212c18 -s ours am: b1452777 -s ours am: 52e794ee -s ours am: 77e4746c -s ours am: 36bf22cf -s ours

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

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



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