Fix emulator dns.

Really fix it this time.  The previous fix had a flaw which tested ok but was removed
after a code review.  This flaw masked problems in DataConnection, which this fix
fixes.

bug:2849192
Change-Id: I50d2dd827d4427f8030c0f590c85672869b509ff