Merge "Minor changes to the async DNS query JAVA API" am: c8dfb72891
am: 5b0b36a6b4

Change-Id: Ib1e317597d33a460e80a4efc63835754c1c1b3c7