Merge "Move NattKeepalivePacketData out of the framework"
am: d3ee38785b

Change-Id: I3c291d378ed3dc54199708fdc188a908ccb3ee08
tree: 0ab3fa6ffce58f97d34419d9dcf0daacb96b7956
  1. core/
  2. services/
  3. tests/