Merge "Pass all relevant resolver info to netd" into pi-dev