Merge "Increase the DNS TTL to 5s to fix netd_test. am: f581017c am:...
Merge "Increase the DNS TTL to 5s to fix netd_test. am: f581017c am: 5da3d756" into nyc-mr1-dev-plus-aosp
am: ec4f75fb
* commit 'ec4f75fb':
Change-Id: I4bcc82290d6dabd334211b6c11c0c6324eda1665