Merge "Update PrivateDnsMode from StringDef to IntDef"
tree: c5aeca53690e21c650e502352c4332fa8396c33a
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING