am ab6b77fd: Merge "Be cool in backup/restore of apps that can\'t touch external storage"

* commit 'ab6b77fd85979212299d8aef0b2c83c005b13abc':
  Be cool in backup/restore of apps that can't touch external storage