Merge "Remove NATT keepalive from IpSecTransform" am: ef8a605c6f

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

Change-Id: I6a0e26ee28e1b9bb0906c840826b7a9ddc88a818
tree: 0bb237c7ff0095f2991f3fb8ffe0c7f0762e41db
  1. core/
  2. services/
  3. wifi/