[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 -s ours am: 3d98d21f -s ours am: 6cebb467 -s ours am: b586b99b -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: I6394837b091235a5deaa708d17f2049de01b9403