am cfd19c81: am 584004fe: Merge "Tests for persistable Uri permission grants." into klp-dev

* commit 'cfd19c8174f02f50be02cd5f1e2e954a002d6a90':
  Tests for persistable Uri permission grants.