Merge "[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData" am: 533b2960fc
am: 968c9f495c

Change-Id: I3b0645585140d8ee12f896946a2a1fbb519e6195