Move to new read only flag

Bug: 325521253
Test: TH

Change-Id: I36f6bf987f9560bf0361a35742cd5774c808e2d5
diff --git a/framework/api/current.txt b/framework/api/current.txt
index ab684fd..6a1dcc8 100644
--- a/framework/api/current.txt
+++ b/framework/api/current.txt
@@ -52,7 +52,7 @@
     method @NonNull public int[] getSecurityTypes();
     method @Nullable public android.net.wifi.WifiSsid getWifiSsid();
     method public int getWifiStandard();
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") public boolean is80211azNtbResponder();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public boolean is80211azNtbResponder();
     method public boolean is80211mcResponder();
     method public boolean isPasspointNetwork();
     method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public boolean isTwtResponder();
@@ -430,7 +430,7 @@
     method @NonNull public android.net.wifi.WifiInfo.Builder setNetworkId(int);
     method @NonNull public android.net.wifi.WifiInfo.Builder setRssi(int);
     method @NonNull public android.net.wifi.WifiInfo.Builder setSsid(@NonNull byte[]);
-    method @FlaggedApi("com.android.wifi.flags.add_subscription_id") @NonNull public android.net.wifi.WifiInfo.Builder setSubscriptionId(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.WifiInfo.Builder setSubscriptionId(int);
   }
 
   public class WifiManager {
@@ -505,7 +505,7 @@
     method public boolean isTlsV13Supported();
     method public boolean isTrustOnFirstUseSupported();
     method public boolean isWapiSupported();
-    method @FlaggedApi("com.android.wifi.flags.wep_usage") public boolean isWepSupported();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public boolean isWepSupported();
     method public boolean isWifiDisplayR2Supported();
     method public boolean isWifiEnabled();
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isWifiPasspointEnabled();
@@ -514,7 +514,7 @@
     method public boolean isWpa3SaePublicKeySupported();
     method public boolean isWpa3SaeSupported();
     method public boolean isWpa3SuiteBSupported();
-    method @FlaggedApi("com.android.wifi.flags.wpa_personal_usage") public boolean isWpaPersonalSupported();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public boolean isWpaPersonalSupported();
     method @Deprecated public boolean pingSupplicant();
     method public void queryAutojoinGlobal(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);
     method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void querySendDhcpHostnameRestriction(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.IntConsumer);
@@ -1317,18 +1317,18 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.p2p.WifiP2pDeviceList> CREATOR;
   }
 
-  @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") public final class WifiP2pDiscoveryConfig implements android.os.Parcelable {
-    method @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") public int describeContents();
-    method @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") public int getFrequencyMhz();
-    method @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") public int getScanType();
-    method @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.p2p.WifiP2pDiscoveryConfig> CREATOR;
+  @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public final class WifiP2pDiscoveryConfig implements android.os.Parcelable {
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public int describeContents();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public int getFrequencyMhz();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public int getScanType();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.p2p.WifiP2pDiscoveryConfig> CREATOR;
   }
 
-  @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") public static final class WifiP2pDiscoveryConfig.Builder {
-    ctor @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") public WifiP2pDiscoveryConfig.Builder(int);
-    method @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") @NonNull public android.net.wifi.p2p.WifiP2pDiscoveryConfig build();
-    method @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") @NonNull public android.net.wifi.p2p.WifiP2pDiscoveryConfig.Builder setFrequencyMhz(@IntRange(from=0) int);
+  @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public static final class WifiP2pDiscoveryConfig.Builder {
+    ctor @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public WifiP2pDiscoveryConfig.Builder(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.p2p.WifiP2pDiscoveryConfig build();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.p2p.WifiP2pDiscoveryConfig.Builder setFrequencyMhz(@IntRange(from=0) int);
   }
 
   public class WifiP2pGroup implements android.os.Parcelable {
@@ -1371,7 +1371,7 @@
     method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void createGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void createGroup(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pConfig, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverPeers(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pDiscoveryConfig, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverPeers(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pDiscoveryConfig, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverPeersOnSocialChannels(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverPeersOnSpecificFrequency(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, int, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
@@ -1433,9 +1433,9 @@
     field public static final int WIFI_P2P_LISTEN_STARTED = 2; // 0x2
     field public static final int WIFI_P2P_LISTEN_STOPPED = 1; // 0x1
     field public static final String WIFI_P2P_PEERS_CHANGED_ACTION = "android.net.wifi.p2p.PEERS_CHANGED";
-    field @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") public static final int WIFI_P2P_SCAN_FULL = 0; // 0x0
-    field @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") public static final int WIFI_P2P_SCAN_SINGLE_FREQ = 2; // 0x2
-    field @FlaggedApi("com.android.wifi.flags.vendor_parcelable_parameters") public static final int WIFI_P2P_SCAN_SOCIAL = 1; // 0x1
+    field @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public static final int WIFI_P2P_SCAN_FULL = 0; // 0x0
+    field @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public static final int WIFI_P2P_SCAN_SINGLE_FREQ = 2; // 0x2
+    field @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public static final int WIFI_P2P_SCAN_SOCIAL = 1; // 0x1
     field public static final String WIFI_P2P_STATE_CHANGED_ACTION = "android.net.wifi.p2p.STATE_CHANGED";
     field public static final int WIFI_P2P_STATE_DISABLED = 1; // 0x1
     field public static final int WIFI_P2P_STATE_ENABLED = 2; // 0x2
@@ -1681,19 +1681,19 @@
 
   public final class RangingResult implements android.os.Parcelable {
     method public int describeContents();
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") public int get80211azInitiatorTxLtfRepetitionsCount();
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") public int get80211azNumberOfRxSpatialStreams();
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") public int get80211azNumberOfTxSpatialStreams();
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") public int get80211azResponderTxLtfRepetitionsCount();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public int get80211azInitiatorTxLtfRepetitionsCount();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public int get80211azNumberOfRxSpatialStreams();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public int get80211azNumberOfTxSpatialStreams();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public int get80211azResponderTxLtfRepetitionsCount();
     method public int getDistanceMm();
     method public int getDistanceStdDevMm();
     method @NonNull public byte[] getLci();
     method @NonNull public byte[] getLcr();
     method @Nullable public android.net.MacAddress getMacAddress();
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") public long getMaxTimeBetweenNtbMeasurementsMicros();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public long getMaxTimeBetweenNtbMeasurementsMicros();
     method public int getMeasurementBandwidth();
     method public int getMeasurementChannelFrequencyMHz();
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") public long getMinTimeBetweenNtbMeasurementsMicros();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public long getMinTimeBetweenNtbMeasurementsMicros();
     method public int getNumAttemptedMeasurements();
     method public int getNumSuccessfulMeasurements();
     method @Nullable public android.net.wifi.aware.PeerHandle getPeerHandle();
@@ -1701,7 +1701,7 @@
     method public int getRssi();
     method public int getStatus();
     method @Nullable public android.net.wifi.rtt.ResponderLocation getUnverifiedResponderLocation();
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") public boolean is80211azNtbMeasurement();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public boolean is80211azNtbMeasurement();
     method public boolean is80211mcMeasurement();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.rtt.RangingResult> CREATOR;
@@ -1711,31 +1711,31 @@
     field public static final int UNSPECIFIED = -1; // 0xffffffff
   }
 
-  @FlaggedApi("com.android.wifi.flags.ranging_result_builder") public static final class RangingResult.Builder {
+  @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public static final class RangingResult.Builder {
     ctor public RangingResult.Builder();
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult build();
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") @NonNull public android.net.wifi.rtt.RangingResult.Builder set80211azInitiatorTxLtfRepetitionsCount(int);
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") @NonNull public android.net.wifi.rtt.RangingResult.Builder set80211azNtbMeasurement(boolean);
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") @NonNull public android.net.wifi.rtt.RangingResult.Builder set80211azNumberOfRxSpatialStreams(int);
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") @NonNull public android.net.wifi.rtt.RangingResult.Builder set80211azNumberOfTxSpatialStreams(int);
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") @NonNull public android.net.wifi.rtt.RangingResult.Builder set80211azResponderTxLtfRepetitionsCount(int);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder set80211mcMeasurement(boolean);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setDistanceMm(int);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setDistanceStdDevMm(int);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setLci(@Nullable byte[]);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setLcr(@Nullable byte[]);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setMacAddress(@Nullable android.net.MacAddress);
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") @NonNull public android.net.wifi.rtt.RangingResult.Builder setMaxTimeBetweenNtbMeasurementsMicros(long);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setMeasurementBandwidth(int);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setMeasurementChannelFrequencyMHz(int);
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") @NonNull public android.net.wifi.rtt.RangingResult.Builder setMinTimeBetweenNtbMeasurementsMicros(long);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setNumAttemptedMeasurements(int);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setNumSuccessfulMeasurements(int);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setPeerHandle(@Nullable android.net.wifi.aware.PeerHandle);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setRangingTimestampMillis(long);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setRssi(int);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setStatus(int);
-    method @FlaggedApi("com.android.wifi.flags.ranging_result_builder") @NonNull public android.net.wifi.rtt.RangingResult.Builder setUnverifiedResponderLocation(@Nullable android.net.wifi.rtt.ResponderLocation);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult build();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder set80211azInitiatorTxLtfRepetitionsCount(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder set80211azNtbMeasurement(boolean);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder set80211azNumberOfRxSpatialStreams(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder set80211azNumberOfTxSpatialStreams(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder set80211azResponderTxLtfRepetitionsCount(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder set80211mcMeasurement(boolean);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setDistanceMm(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setDistanceStdDevMm(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setLci(@Nullable byte[]);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setLcr(@Nullable byte[]);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setMacAddress(@Nullable android.net.MacAddress);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setMaxTimeBetweenNtbMeasurementsMicros(long);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setMeasurementBandwidth(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setMeasurementChannelFrequencyMHz(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setMinTimeBetweenNtbMeasurementsMicros(long);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setNumAttemptedMeasurements(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setNumSuccessfulMeasurements(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setPeerHandle(@Nullable android.net.wifi.aware.PeerHandle);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setRangingTimestampMillis(long);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setRssi(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setStatus(int);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.RangingResult.Builder setUnverifiedResponderLocation(@Nullable android.net.wifi.rtt.ResponderLocation);
   }
 
   public abstract class RangingResultCallback {
@@ -1756,7 +1756,7 @@
     method @Nullable public android.net.MacAddress getMacAddress();
     method public int getPreamble();
     method public int getResponderType();
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") public boolean is80211azNtbSupported();
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public boolean is80211azNtbSupported();
     method public boolean is80211mcSupported();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.rtt.ResponderConfig> CREATOR;
@@ -1767,7 +1767,7 @@
   public static final class ResponderConfig.Builder {
     ctor public ResponderConfig.Builder();
     method @NonNull public android.net.wifi.rtt.ResponderConfig build();
-    method @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") @NonNull public android.net.wifi.rtt.ResponderConfig.Builder set80211azNtbSupported(boolean);
+    method @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") @NonNull public android.net.wifi.rtt.ResponderConfig.Builder set80211azNtbSupported(boolean);
     method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder set80211mcSupported(boolean);
     method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setCenterFreq0Mhz(@IntRange(from=0) int);
     method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setCenterFreq1Mhz(@IntRange(from=0) int);
@@ -1825,7 +1825,7 @@
     field public static final String ACTION_WIFI_RTT_STATE_CHANGED = "android.net.wifi.rtt.action.WIFI_RTT_STATE_CHANGED";
     field public static final String CHARACTERISTICS_KEY_BOOLEAN_LCI = "key_lci";
     field public static final String CHARACTERISTICS_KEY_BOOLEAN_LCR = "key_lcr";
-    field @FlaggedApi("com.android.wifi.flags.rtt_11az_ntb_ranging_support") public static final String CHARACTERISTICS_KEY_BOOLEAN_NTB_INITIATOR = "key_ntb_initiator";
+    field @FlaggedApi("com.android.wifi.flags.android_v_wifi_api") public static final String CHARACTERISTICS_KEY_BOOLEAN_NTB_INITIATOR = "key_ntb_initiator";
     field public static final String CHARACTERISTICS_KEY_BOOLEAN_ONE_SIDED_RTT = "key_one_sided_rtt";
     field public static final String CHARACTERISTICS_KEY_BOOLEAN_STA_RESPONDER = "key_sta_responder";
   }