am 4d6abcf2: Merge "Add tests for granting URIs with path-based permissions." into gingerbread

Merge commit '4d6abcf29caa73462ffcc49a3cdaa27e8943b2e9' into gingerbread-plus-aosp

* commit '4d6abcf29caa73462ffcc49a3cdaa27e8943b2e9':
  Add tests for granting URIs with path-based permissions.