Merge changes I90884c71,I866b6078,I6d638a1d am: c8d9925a5e

Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2458868

Change-Id: I9129ad022370566599e3463ba5e414abd59704d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 02b7a5cf3f5cbd60f5e99bd323b3ea7ebe2d6c5f
  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