Merge "Refactor PermissionManager.SPLIT_PERMISSIONS"