Merge "Update PrivateDnsMode from StringDef to IntDef"