Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4  -s ours am: be0dab477e am: 47656a3cbd am: 99755cb458 am: 0a2374524a" into nyc-mr2-dev-plus-aosp
am: 37115274c0  -s ours

Change-Id: Ieb469af9a2748809f428394db82c1694699fc9f2