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