Merge "Pass DoH information to DnsResolver" into main am: af569157d5

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

Change-Id: I1765041881d74ab5b259ce1dfd20020fa431255c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>