Merge "Fix testRawQueryNXDomain in DnsResolverTest" into qt-r1-dev am: eb27a2da7e
am: 268457a507

Change-Id: I094acf985d6bfef9f16bafce08eb6d7dce612aa5