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

Since dns query happens on non-default interface, only query the
 address type that the interface has;otherwise the dns results
 might not be usable.

CRs-fixed: 694805
Change-Id: I4ce900507bf18a9f60a2971cf496aa7c930d540b
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 branch 'cm-11.0' into stable/cm-11.0