Merge "Make NattKeepalivePacketData @SystemApi"
am: 3516f5853a

Change-Id: I6d212d1b830f29b8d8a77c727bfa23572f7e08a6