Merge "Improve naming of some of the constants in device_policy_enums."