Merge "[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" into udc-d1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
a2000d7598