Merge "Make NattKeepalivePacketData @SystemApi"
am: 9fef5a5cf0

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