Merge "Remove retainHardAndSoftRestrictedPermissions()."