Merge changes I81466537,I6ad7451e into rvc-dev

* changes:
  Minor fix on CarService.dump()
  Fixed car service dumpsys help documentation.
diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index 36ebd7d..661bc4f 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -666,7 +666,7 @@
             return;
         } else if ("--services".equals(args[0])) {
             if (args.length < 2) {
-                writer.print("Must pass services to dump when using --services");
+                writer.println("Must pass services to dump when using --services");
                 return;
             }
             int length = args.length - 1;
@@ -726,8 +726,8 @@
         writer.println("\t  shows this help");
         writer.println("--list");
         writer.println("\t  lists the name of all services");
-        writer.println("--list");
-        writer.println("\t  lists the name of all HAls");
+        writer.println("--list-hals");
+        writer.println("\t  lists the name of all HALs");
         writer.println("--services <SVC1> [SVC2] [SVCN]");
         writer.println("\t  dumps just the specific services, where SVC is just the service class");
         writer.println("\t  name (like CarUserService)");