Merge "Refactor answer callback for async DNS query JAVA API"
am: b65af07286

Change-Id: I26eb642cc04e3804cd82a56e45a890689b3c643f