Merge "AppOpsService: Fix de-dup for change records on OpModeWatchers." into rvc-dev am: 4379955437 am: 5399cde3a7

Change-Id: I91be54e7b14bed5a4ca8091a75150b5f875b4a51

services/core/java/com/android/server/appop/AppOpsService.java

@@ -2545,11 +2545,11 @@ public class AppOpsService extends IAppOpsService.Stub {
         if (callbacks == null) {
             callbacks = new HashMap<>();
         }
-        boolean duplicate = false;
         final int N = cbs.size();
         for (int i=0; i<N; i++) {
             ModeCallback cb = cbs.valueAt(i);
             ArrayList<ChangeRec> reports = callbacks.get(cb);
+            boolean duplicate = false;
             if (reports == null) {
                 reports = new ArrayList<>();
                 callbacks.put(cb, reports);