Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" am: fdcd562529

Change-Id: I4128678546feba6840ddb210244992846705e5d9