Merge "Revert "Fix the bug introduced in ag/19575369""

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

@@ -568,7 +568,7 @@ public class LegacyAppOpsServiceInterfaceImpl implements AppOpsServiceInterface
                         printedOpHeader = true;
                     }
                     printWriter.print("      #"); printWriter.print(j); printWriter.print(": ");
-                    printWriter.println(modeChangedListenerSet.valueAt(j).toString());
+                    printWriter.println(mOpModeWatchers.valueAt(i).toString());
                 }
             }
         }