Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager"