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

Change-Id: I530e8b5f2a25b8fd92734effa0d059e5a6c7d490