Merge "Improve test and fix doulbe-close fd problem for async DNS API cts" am: 277181d9d3
am: af31d7737c

Change-Id: Ifda2107b18e1dad6cef227f440bb3cf10a401e15