Revert "DNS: make the same ip type DNS query as the interface address type"

This reverts commit 53c2af91d6bc2e44c53aea98a06a76834e59fe09.
The reverted commit broke vpn connect.

Change-Id: I7e80dcf1fa1ba86effbe7716d50a5a08be7898ad
Merge remote-tracking branch 'cm/cm-11.0' into test