[automerger skipped] Merge "Merge "Fix race condition caused by fd reused for...

[automerger skipped] Merge "Merge "Fix race condition caused by fd reused for DnsResolver" into qt-dev am: 7187dbc4 am: f7e2b55a" into qt-r1-dev-plus-aosp
am: 930d4003 -s ours
am skip reason: change_id I443bb11b15845b079ee4370a7797e692e62fa3c8 with SHA1 07de4cf8 is in history

Change-Id: I45c5e6309a6218448b82b7226aa3190177058bb4