Merge "Remove NATT keepalive from IpSecTransform" am: c20770fee5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512881

Change-Id: I6a0e26ee28e1b9bb0906c840826b7a9ddc88a818