Merge changes from topic "DnsException" am: 0db3016398 am: 3c6afbf3eb

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

Change-Id: Ia726a28262e131d4fdb7bf2635ef2b25e98660b7