Merge changes from topic "DnsException" am: 0db3016398 am: d109712194 am: de3683b97c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908042

Change-Id: I432576048f5c094c43dc64d26060d83f876adad8