Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity"

framework/src/android/net/ConnectivityManager.java

@@ -2905,10 +2905,14 @@ public class ConnectivityManager {
         ResultReceiver wrappedListener = new ResultReceiver(null) {
             @Override
             protected void onReceiveResult(int resultCode, Bundle resultData) {
-                Binder.withCleanCallingIdentity(() ->
+                final long token = Binder.clearCallingIdentity();
+                try {
                     executor.execute(() -> {
                         listener.onTetheringEntitlementResult(resultCode);
-                            }));
+                    });
+                } finally {
+                    Binder.restoreCallingIdentity(token);
+                }
             }
         };