am 94758633: am b5da7b23: Merge "Throw when taking non-existant Uri permission." into klp-dev

* commit '94758633943e77c820fd77f96329848cc7f31230':
  Throw when taking non-existant Uri permission.