DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4  -s ours am: be0dab477e
am: 47656a3cbd

Change-Id: I5835528fe288b1ee117265d37e39fcfd0bbb301b