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

Change-Id: I488efad5dffa7a4b74ed0fd6525c918311651252