Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE

Change-Id: Ica66eff1f4554cf4d115a923229dcaa51493d672
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/password/PasswordUtils.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/password/PasswordUtils.java
index 7a4d024..fb7c6ae 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/password/PasswordUtils.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/password/PasswordUtils.java
@@ -89,7 +89,8 @@
                     /* initialPid= */ -1,
                     getCallingAppPackageName(activityToken),
                     userId,
-                    message);
+                    message,
+                    /* force */ false);
         } catch (RemoteException e) {
             Log.v(TAG, "Could not talk to activity manager.", e);
         }