Merge "Run grant URI permission tests in presubmit"