Android 10.0.0 release 40
Make the Q dnsresolver tests pass on 2020-01 or later modules. am: 3f47223fe9 am: 3eafc6a87b

Change-Id: I384d512892163c3010b3b3ea2a8b737f5971462d