tree 9c9f7bf44e8e3ac6dba356fa20e0fa0feb7acb07
parent 3014137d2081356f557ff7cded5cec574bba4011
parent 1a6cb4936d62ca3adc434cb1319ffd1352bbacaa
author Mike Yu <yumike@google.com> 1611957610 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611957610 +0000

Fix flaky ResolverTest.ConnectTlsServerTimeout due to flag reset am: 1a6cb4936d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70a515ef04fecf785d9431f4ec64cffbf87468ae