Merge "Make NattKeepalivePacketData @SystemApi" am: 3516f5853a am: 7522764e59 am: b256f4d348

Change-Id: Idd26f3118e879ab05a8cdd23a9e4999b3bafbf47