Merge "Refactor answer callback for async DNS query JAVA API" am: f1d0fd2642
am: 9a4c839725

Change-Id: I7538b247c5bd84d7f5b21be11b9bb1940fb9ba5a