Merge "Merge "Disable InetDiagSocketTest in a better way." am: c28356b9 am: cc94ad60" into qt-dev-plus-aosp