Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf am: ee958351b7 am: e6060558b3
am: 1eb2ded281
Change-Id: I7b51f2a51a15ca961e345e8540f2f0ff517494d4
This commit is contained in: