Merge "Add constants for enterprise strings in PermissionController"