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

Change-Id: I599cfea345a61286d74b87c9d4c7e5087e6e7308