Merge "Do not generate watchlist test report in production config" into pi-dev

am: 627596f6a5

Change-Id: Id4a5a9ba98b1d48f77190381ad90cd77f783d04d

services/core/java/com/android/server/net/watchlist/NetworkWatchlistShellCommand.java

@@ -91,7 +91,7 @@ class NetworkWatchlistShellCommand extends ShellCommand {
         final long ident = Binder.clearCallingIdentity();
         try {
             // Reset last report time
-            if (!WatchlistConfig.getInstance().isConfigSecure()) {
+            if (WatchlistConfig.getInstance().isConfigSecure()) {
                 pw.println("Error: Cannot force generate report under production config");
                 return -1;
             }