Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes.""

This reverts commit 623bbef1.

Reason for revert: The original change was correct.

Bug: 153676562
Test: presubmit

Change-Id: I4413dfab9704546e8a7a8c6b1955f23b8f73cc32

services/core/java/com/android/server/am/ActivityManagerService.java

@@ -20045,8 +20045,7 @@ public class ActivityManagerService extends IActivityManager.Stub
             if (uid == mTargetUid && isTargetOp(code)) {
                 final long identity = Binder.clearCallingIdentity();
                 try {
-                    return mAppOpsService.noteProxyOperation(code, Process.SHELL_UID,
-                            "com.android.shell", null, uid, packageName, featureId,
+                    return superImpl.apply(code, Process.SHELL_UID, "com.android.shell", featureId,
                             shouldCollectAsyncNotedOp, message);
                 } finally {
                     Binder.restoreCallingIdentity(identity);