Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am:...
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad71 am: fa220182
am: 8469d52d -s ours
Change-Id: Ib3b38a9c4dacf09aeec385e46b464598c0214a76