[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics"...

[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6 am: b677954b -s ours am: 6c557285 -s ours am: 72ab6c2b -s ours

am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 6a49d466 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11940428

Change-Id: I6b42c79d759be41e29f0a3c8375563adffe5329c