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
am: f68199a4
Change-Id: Icea5f48ca2c969328210a000ffe88dc94e70a0c8