[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd -s ours am: 3d98d21ffd -s ours am: 6cebb467c1 -s ours
am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 1a5e45e37d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11940428
Change-Id: I2e0d589fc92ea58c256538562b7e6a6eb7b95d42
This commit is contained in: