Merge "Move NattKeepalivePacketData out of the framework" am: d3ee38785b

am: 382b3d2a63

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