Merge "Make NattKeepalivePacketData @SystemApi" am: d21ba54347 am: 1f5333e4e7

Change-Id: If93d5bacd85fa5209f3fbb55d1cf0af1231e605d
tree: eeade3b23c48806b04f368556677d075ea16f890
  1. core/
  2. services/
  3. tests/