Merge "Add some DoH tests in resolv_integration_test" am: 05c45a0e am: 66917e7d am: 52bd51cb am: c9e722ce

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1771146

Change-Id: I946b4cc4ce6cf05c2c7216d36ad5f19718a4e16b