DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours
am: 4a4b6bfafb
Change-Id: Id479b2d27fd8396047312fe7259971c167b8d705
This commit is contained in:
2dfdf662d0 -s ours
am: 4a4b6bfafb
Change-Id: Id479b2d27fd8396047312fe7259971c167b8d705