Merge changes I6c0d0f92,I21bc0644

* changes:
  Follow-up commit of aosp/2367328
  Restrict DNS by UID-based network permission
tree: 9b0f4693d45db5d9044a3e7fe2a3684d2ab2597e
  1. client/
  2. include/
  3. netutils_wrappers/
  4. server/
  5. tests/
  6. .editorconfig
  7. Android.bp
  8. NOTICE
  9. OWNERS
  10. PREUPLOAD.cfg
  11. TEST_MAPPING