Merge "Freeze netd AIDL interface (framework)"

packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java

@@ -181,4 +181,9 @@ public class NetworkObserverRegistry extends INetdUnsolicitedEventListener.Stub
 
     @Override
     public void onStrictCleartextDetected(int uid, String hex) {}
+
+    @Override
+    public int getInterfaceVersion() {
+        return INetdUnsolicitedEventListener.VERSION;
+    }
 }

services/core/java/com/android/server/NetworkManagementService.java

@@ -725,6 +725,11 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
             ActivityManager.getService().notifyCleartextNetwork(uid,
                     HexDump.hexStringToByteArray(hex));
         }
+
+        @Override
+        public int getInterfaceVersion() {
+            return INetdUnsolicitedEventListener.VERSION;
+        }
     }
 
     //