Merge "Add control flags in asynchronous DNS query API" am: 9a0d6e60a3
am: 67da038184

Change-Id: I11f22266ab592595eb68b795059b07f999424fc3