Merge "Add AIDL parcelable for NattKeepalivePacketData"
am: 781e7d163f

Change-Id: Idd5ff9d4d52064dbfe5df1e4677c41bcccd9c09a
tree: 904d55ea47b556913f169c4d070809357522bc7c
  1. core/
  2. services/
  3. tests/