Merge "Fix IntDef for DevicePolicyManager.PrivateDnsMode" into sc-dev