diff --git a/services/core/java/com/android/server/wm/ActivitySecurityModelFeatureFlags.java b/services/core/java/com/android/server/wm/ActivitySecurityModelFeatureFlags.java
index 47e78f0c6e9bc..91c4a2ff03e0b 100644
--- a/services/core/java/com/android/server/wm/ActivitySecurityModelFeatureFlags.java
+++ b/services/core/java/com/android/server/wm/ActivitySecurityModelFeatureFlags.java
@@ -43,9 +43,12 @@ class ActivitySecurityModelFeatureFlags {
     static final String DOC_LINK = "go/android-asm";
 
     private static final String NAMESPACE = NAMESPACE_WINDOW_MANAGER;
-    private static final String KEY_ASM_RESTRICTIONS_ENABLED = "asm_restrictions_enabled";
-    private static final String KEY_ASM_TOASTS_ENABLED = "asm_toasts_enabled";
-    private static final String KEY_ASM_EXEMPTED_PACKAGES = "asm_exempted_packages";
+    private static final String KEY_ASM_PREFIX = "ActivitySecurity__";
+    private static final String KEY_ASM_RESTRICTIONS_ENABLED = KEY_ASM_PREFIX
+            + "asm_restrictions_enabled";
+    private static final String KEY_ASM_TOASTS_ENABLED = KEY_ASM_PREFIX + "asm_toasts_enabled";
+    private static final String KEY_ASM_EXEMPTED_PACKAGES = KEY_ASM_PREFIX
+            + "asm_exempted_packages";
     private static final int VALUE_DISABLE = 0;
     private static final int VALUE_ENABLE_FOR_U = 1;
     private static final int VALUE_ENABLE_FOR_ALL = 2;
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index d6d3dc7b6ee28..50eb356a0b377 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -1965,7 +1965,7 @@ class ActivityStarter {
                 /* action */
                 action,
                 /* version */
-                1,
+                2,
                 /* multi_window - we have our source not in the target task, but both are visible */
                 targetTask != null && mSourceRecord != null
                         && !targetTask.equals(mSourceRecord.getTask()) && targetTask.isVisible()