Merge "Add control flags in asynchronous DNS query API"
am: c04f9f731a

Change-Id: Ideb1d8f8224b546dc6acfbdcbdc62353203bdf2e