Merge "Add AIDL parcelable for NattKeepalivePacketData"