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

Change-Id: Icb2d49cc1be0ae7993506c81ebcf2ecea40e5825