Merge "Support adding NATT keepalive packet filter" am: 7a571f5be4 am: 04bd7b864c

am: 621463a0c0

Change-Id: I403cd14ac9aa6b001c4e580abbb33a615931a192

tests/net/java/com/android/server/ConnectivityServiceTest.java

@@ -567,6 +567,16 @@ public class ConnectivityServiceTest {
                 protected void preventAutomaticReconnect() {
                     mPreventReconnectReceived.open();
                 }
+
+                @Override
+                protected void addKeepalivePacketFilter(Message msg) {
+                    Log.i(TAG, "Add keepalive packet filter.");
+                }
+
+                @Override
+                protected void removeKeepalivePacketFilter(Message msg) {
+                    Log.i(TAG, "Remove keepalive packet filter.");
+                }
             };
 
             assertEquals(mNetworkAgent.netId, nmNetworkCaptor.getValue().netId);