tree 619bcf904214131e4c8bbcb41a07a15d3ee20df8
parent 004ecafba2563b7c6ba7a92fb79d2690cdea39ac
parent 4beef06a4b2e328f856baec68e55a1d20a4362f7
author Aswin Sankar <apsankar@google.com> 1660087269 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660087269 +0000

[automerger skipped] Merge "EpdgSelector: timeout for DnsResolver query future" into tm-qpr-dev am: 4beef06a4b -s ours

am skip reason: skipped by user apsankar

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Iwlan/+/19560842

Change-Id: I138091002442d8c13b57bdf4517a9abacd2ae4d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>