Merge "Support persistable Uri permission grants."