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

Change-Id: I957ea1410a74d92bde191a67756fae53d966b0a3