— a/alps/frameworks/base/core/java/android/util/FeatureFlagUtils.java
+++ b/alps/frameworks/base/core/java/android/util/FeatureFlagUtils.java
@@ -67,7 +67,7 @@ public class FeatureFlagUtils {
// (b/148367230).
DEFAULT_FLAGS.put(SETTINGS_DO_NOT_RESTORE_PRESERVED, “true”);
-
DEFAULT_FLAGS.put("settings_tether_all_in_one", "false");
-
DEFAULT_FLAGS.put("settings_tether_all_in_one", "true"); DEFAULT_FLAGS.put("settings_contextual_home", "false"); DEFAULT_FLAGS.put(SETTINGS_PROVIDER_MODEL, "true"); DEFAULT_FLAGS.put(SETTINGS_USE_NEW_BACKUP_ELIGIBILITY_RULES, "true");