Merge "Remove NATT keepalive from IpSecTransform" am: ef8a605c6f am: 1453310967

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

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