Merge "Allow an app to drive permission backup+restore"