Merge "Update PrivateDnsMode from StringDef to IntDef" am: a23e55da49

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

Change-Id: I391d8dd2615f090d3112af69248aea70e334f62f
tree: c5aeca53690e21c650e502352c4332fa8396c33a
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING