Merge "Update PrivateDnsMode from StringDef to IntDef" am: 1742bf024c am: eb6daaa8af

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562

Change-Id: I0b2ad20c59397395175b82688cfe657af43a1b19