Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into...

Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e5 am: 5d65931a  -s ours am: f82c3730 am: 8c9ff681 am: 4b3c5900 am: 39435776  -s ours am: bafa3c1d am: 7cd3c47c am: 770eff87 am: ce155551 am: 0792846e" into nyc-mr2-dev-plus-aosp