[automerger skipped]Merge "Pass all relevant resolver info to netd" into pi-dev
am: ca697c621e  -s ours

Change-Id: I5d2271059f77d290c65cd4a55d31334154e82270
tree: 7492d2be7821b4eb22ae5e53f7188fe87ddba6f7
  1. core/
  2. services/
  3. tests/