[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: 160850d48d am: 5500673334 -s ours am: 96df2b115f -s ours am: 603675f5d7 -s ours
am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 d0e4221f64 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11940428
Change-Id: I6b42c79d759be41e29f0a3c8375563adffe5329c
This commit is contained in: