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

Change-Id: If93d5bacd85fa5209f3fbb55d1cf0af1231e605d