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 am: 5d725143 am: 558e8ede am: 8ad00fc9

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

Change-Id: Iad585228477da9028be360cd34372afb31cb73ad