[Intrusion Logging] Fix INetdEventCallback in disable

The INetdEventCallback CALLBACK_CALLER_DEVICE_POLICY is registered, but the incorrect callback was removed. Bugfix so the correct callback is toggled. Bug: 412330307 Test: atest android.security.cts.IntrusionDetectionManagerTest Ignore-AOSP-First: security feature Flag: EXEMPT: bugfix in localized component (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:609dd77d532761620249061b93850e596915c518) Merged-In: I46ee5844dc2ebf3d4e41af699d93fede5c70dd7c Change-Id: I46ee5844dc2ebf3d4e41af699d93fede5c70dd7c

Author: eprucka3

services/core/java/com/android/server/security/intrusiondetection/NetworkLogSource.java

@@ -83,11 +83,11 @@ public void disable() {
  }
  try {
  if (!mIpConnectivityMetrics.removeNetdEventCallback(
- INetdEventCallback.CALLBACK_CALLER_NETWORK_WATCHLIST)) {
+ INetdEventCallback.CALLBACK_CALLER_DEVICE_POLICY)) {
 
  mIsNetworkLoggingEnabled.set(false);
  } else {
- Slog.e(TAG, "Failed to enable network logging; invalid callback");
+ Slog.e(TAG, "Failed to disable network logging; invalid callback");
  }
  } catch (RemoteException e) {
  Slog.e(TAG, "Failed to disable network logging; ", e);