Merge "Support DNS-over-TLS probes in NetworkDiagnostics" am: 64ffa1762f

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

Change-Id: I9e436446179750315be45ddc034cece5afd3c004