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

Change-Id: Iae8d866230dfd8aa2de1b69891d8494812886aac