Snap for 7514518 from e0c89adf4648e078a7eb63c951f8a430f3e4b5c1 to sc-release

Change-Id: I78af40437650f7019034d125de9343e0ffd531c4
diff --git a/src/com/android/internal/car/CarServiceHelperService.java b/src/com/android/internal/car/CarServiceHelperService.java
index a001482..8e82316 100644
--- a/src/com/android/internal/car/CarServiceHelperService.java
+++ b/src/com/android/internal/car/CarServiceHelperService.java
@@ -186,15 +186,15 @@
                     || (intent.getFlags() & Intent.FLAG_RECEIVER_FOREGROUND) == 0) {
                 return;
             }
-            int powerCycle = PowerCycle.POWER_CYCLE_SUSPEND;
+            int powerCycle = PowerCycle.POWER_CYCLE_SHUTDOWN_ENTER;
             try {
                 mCarWatchdogDaemonHelper.notifySystemStateChange(StateType.POWER_CYCLE,
                         powerCycle, /* arg2= */ 0);
                 if (DBG) {
-                    Slogf.d(TAG, "Notified car watchdog daemon a power cycle(%d)", powerCycle);
+                    Slogf.d(TAG, "Notified car watchdog daemon of power cycle(%d)", powerCycle);
                 }
             } catch (RemoteException | RuntimeException e) {
-                Slogf.w(TAG, "Notifying system state change failed: %s", e);
+                Slogf.w(TAG, "Notifying power cycle state change failed: %s", e);
             }
         }
     };