Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am:...
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d76 am: 8f4f4daf am: 7c0ea478 am: 28487385 -s ours am: f19cea14
am: ee958351
Change-Id: I0413429b94182ce3c7500c3332f110137dceeda7