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

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

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