Merge 447c2093870e678d0c85b285bea3a0623591b974 on remote branch

Change-Id: I1bd034f65b3f47da4f933b6885dca9b9ca0b1188
diff --git a/automotive/powerpolicy/aidl/android/frameworks/automotive/powerpolicy/internal/ICarPowerPolicySystemNotification.aidl b/automotive/powerpolicy/aidl/android/frameworks/automotive/powerpolicy/internal/ICarPowerPolicySystemNotification.aidl
index 08078f0..61f88b4 100644
--- a/automotive/powerpolicy/aidl/android/frameworks/automotive/powerpolicy/internal/ICarPowerPolicySystemNotification.aidl
+++ b/automotive/powerpolicy/aidl/android/frameworks/automotive/powerpolicy/internal/ICarPowerPolicySystemNotification.aidl
@@ -47,10 +47,12 @@
    * System private API for CarService.
    *
    * @param policyId The current policy ID.
+   * @param force If {@code true}, the given policy is applied even when the current policy
+   *        is a system power policy.
    * @throws IllegalStateException if it fails to notify power policy change.
    * @throws SecurityException if the caller doesn't have sufficient permissions.
    */
-  void notifyPowerPolicyChange(in @utf8InCpp String policyId);
+  void notifyPowerPolicyChange(in @utf8InCpp String policyId, boolean force);
 
   /**
    * CarService uses this method to tell that there is a newly defined power policy.