Merge "help parameter now returns 0"

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

@@ -229,6 +229,9 @@ final class ActivityManagerShellCommand extends ShellCommand {
         final PrintWriter pw = getOutPrintWriter();
         try {
             switch (cmd) {
+                case "help":
+                    onHelp();
+                    return 0;
                 case "start":
                 case "start-activity":
                     return runStartActivity(pw);