Merge "Make NattKeepalivePacketData @SystemApi"