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

Change-Id: Iead684a718278b900a3d847e9e88bae30b850646