Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12  -s ours am: b30169299b  -s ours am: 31c7fa003d  -s ours am: 966e600365  -s ours" into nyc-mr2-dev-plus-aosp
am: 3b7ee3598f  -s ours

Change-Id: Iab23629aac79aa226a1d21508b4db9648537954b