am be17a614: Merge "Require that persistable Uri permissions be taken." into klp-dev

* commit 'be17a61447e1a7992a6c855059a3c43ab3216610':
  Require that persistable Uri permissions be taken.