Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841eb -s ours am: be0dab47 am: 47656a3c am: 99755cb4 am: 0a237452" into nyc-mr2-dev-plus-aosp