Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:...
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e5 am: 5d65931a -s ours
am: f82c3730
Change-Id: I603a9a75c3874f1b7cf099aa26b865fdbe7b0e99