Merge "Fix the wrong condition statement in tokio select for doh_handler and...

Merge "Fix the wrong condition statement in tokio select for doh_handler and correct some return code in doh_query" am: 2575a72d

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

Change-Id: Ica11b6679b9c462b4cb00a44d3feb2f59ea82b0d