Merge changes from topic "am-ca79711f122e4944a8cb2481678537ba" into udc-dev-plus-aosp
* changes: [automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions in MediaMetadata"" into tm-qpr-dev am:7213e92fca-s ours am:ef231d6688-s ours [automerger skipped] DO NOT MERGE am:0b672c0a5f-s ours am:8677b7c42f-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
2333a526cb