[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 am: d2b01940 -s ours am: 436cd0d4 -s ours

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

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

Change-Id: I5837d92bd0e38b651ce363596035a4a8888c2b28