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

Change-Id: I53d481772dde130c59690e554be6074307795217