Merge "Move NattKeepalivePacketData out of the framework"
am: 833edcbb1b

Change-Id: I3c291d378ed3dc54199708fdc188a908ccb3ee08