Merge "Use InetDiagMessage.destroyLiveTcpSocket instead of netd.socketDestroy"