Merge \"Always use the default network DNS servers if a VPN does not set any....
Merge \"Always use the default network DNS servers if a VPN does not set any. am: c63059c8 am: cdac640b\" into nyc-mr1-dev-plus-aosp
am: 935b23fd
Change-Id: Ib5badce4fbc657c62c441375d4e6edfe2585b0e3