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

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

Change-Id: I391d8dd2615f090d3112af69248aea70e334f62f