From baad1851263ac9676b7420d9af2c540dfcd5378c Mon Sep 17 00:00:00 2001
From: Robert Luo <robertluo@google.com>
Date: Wed, 12 Apr 2023 02:28:19 +0000
Subject: [PATCH] Revert "Revert "Revert "Revert "Enable ADVANCED_VPN_ENABLED
 For Droidfood""""

This reverts commit 3822f6901ac29604ff44e6136aa5eaffd61a675b.

Reason for revert:
This CL should not be blocked by flaky tests in android.platform.test.scenario.sysui.multiuser.SwitchToExistingGuestAndStartOver#testSwitchToGuestAndStartOver.

see b/277329137 and b/235346731

Test: manual

Change-Id: I5cc7fceb1d036ca8c0ee4707bbac012f21b7fec4
---
 packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index b29066f8e927a..a1f519c455b77 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -679,8 +679,8 @@ object Flags {
 
     // TODO(b/272805037): Tracking Bug
     @JvmField
-    val ADVANCED_VPN_ENABLED = unreleasedFlag(2800, name = "AdvancedVpn__enable_feature",
-            namespace = "vpn", teamfood = true)
+    val ADVANCED_VPN_ENABLED = releasedFlag(2800, name = "AdvancedVpn__enable_feature",
+            namespace = "vpn")
 
     // TODO(b/278761837): Tracking Bug
     @JvmField