Merge changes from topic "DnsException" am: 0db3016398

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

Change-Id: Ie659a26ff2d814092817d96c241ee07f9746744e