Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:...
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a -s ours am: b3016929 -s ours am: 31c7fa00 -s ours am: 966e6003 -s ours" into nyc-mr2-dev-plus-aosp