Merge "Standardize flag usages in DevicePolicyManager" into main