Merge "Add AIDL parcelable for NattKeepalivePacketData"
am: 6d7ed60834

Change-Id: Idd5ff9d4d52064dbfe5df1e4677c41bcccd9c09a