Merge "Move NattKeepalivePacketData out of the framework"

am: d3ee38785b

Change-Id: I3c291d378ed3dc54199708fdc188a908ccb3ee08
This commit is contained in:
Aaron Huang
2019-04-23 21:17:26 -07:00
committed by android-build-merger