Merge "Pass all relevant resolver info to netd"
am: 76f64641bb

Change-Id: If4f46b030fe141a6904a48966e5ab34ffb6b10bc