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

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

Change-Id: Idb10b4b7713dafc465d738f58f36e84808ad81eb