Merge "Add NATT keepalive resources and methods into IpSecService" am: c345527430

am: 70e5117542

Change-Id: I3affb5bdbb0c3f980b6606d728668e74c31646d0

core/java/android/net/IIpSecService.aidl

@@ -72,4 +72,8 @@ interface IIpSecService
             int tunnelResourceId, int direction, int transformResourceId, in String callingPackage);
 
     void removeTransportModeTransforms(in ParcelFileDescriptor socket);
+
+    int lockEncapSocketForNattKeepalive(int encapSocketResourceId, int requesterUid);
+
+    void releaseNattKeepalive(int nattKeepaliveResourceId, int ownerUid);
 }