Merge "Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18 am: ee37330dff" into nyc-mr2-dev-plus-aosp
am: b8aac6758b  -s ours

Change-Id: I0c9b341f62533e895c104c2f14ed911476b58eef