Merge "Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest." am: e7e5a35b38
am: a88f901028

Change-Id: Ifcc3e24ba311b82d06ed8951f2aafd64d48272c6