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

Change-Id: I820fc785fd854284f440203522afd60b186a0d7c