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

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

Change-Id: I4914af2a62515bc9cf0c97ed327728a7736313b0