am b3da3db3: Merge "Surface outgoing Uri permission grants." into klp-dev

* commit 'b3da3db34ae32cf9f57b00710488456e82e5de44':
  Surface outgoing Uri permission grants.