Merge "Update PrivateDnsMode from StringDef to IntDef" am: 0604a2e93e

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

Change-Id: I391d8dd2615f090d3112af69248aea70e334f62f
tree: 3ed1c6107b8aeb33878c0145025d4a755f1c3956
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING