Merge "Move bug workaround for old resolvers past the Private DNS codepath"...

Merge "Move bug workaround for old resolvers past the Private DNS codepath" am: f7fca930 am: 0fa0e778 am: 295f1231

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

Change-Id: I43f4abeedc59d991667dc6f4687513c343940a32