Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315 am: af86efd70d" into nyc-mr2-dev-plus-aosp
am: 651c9cd390  -s ours

Change-Id: Ica80e2af4f50e9e629654723021741bea53be930