Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am:...
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d14 -s ours am: 0e09e8c2
am: 33cd012e
Change-Id: I8444b378a3554ded73e914e332c55e4e0ce36098