Merge "Minor changes to the async DNS query API flag definitions." am: 9a22123ae4 am: cf5ef56465
am: f3fd643dc9

Change-Id: I4df5ae983e21ddde2e2c6c5f0f2b5855d9df2fab