Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d  -s ours am: deea677359 am: 853e178de4 am: c7b754f62b am: 86f242b071 am: d491410316" into nyc-mr2-dev-plus-aosp
am: 09b336febd  -s ours

Change-Id: I0caa68f60a66a17f7627ea83f143555c8fdcb74e