diff --git a/res/xml/bluetooth_device_details_fragment.xml b/res/xml/bluetooth_device_details_fragment.xml
index 68b234da046..23f026b7f14 100644
--- a/res/xml/bluetooth_device_details_fragment.xml
+++ b/res/xml/bluetooth_device_details_fragment.xml
@@ -73,6 +73,9 @@
     <PreferenceCategory
         android:key="feature_controls_group"/>
 
+    <PreferenceCategory
+        android:key="spatial_audio_group"/>
+
     <PreferenceCategory
         android:key="bluetooth_profiles"/>
 
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java b/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java
index b5e4c3256e3..a1e133e6104 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.bluetooth;
 
-import static com.android.settings.bluetooth.BluetoothDeviceDetailsFragment.FEATURE_HEAD_TRACKING_ORDER;
-import static com.android.settings.bluetooth.BluetoothDeviceDetailsFragment.FEATURE_SPATIAL_AUDIO_ORDER;
-
 import android.content.Context;
 import android.media.AudioDeviceAttributes;
 import android.media.AudioDeviceInfo;
@@ -45,7 +42,7 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont
         implements Preference.OnPreferenceClickListener {
 
     private static final String TAG = "BluetoothSpatialAudioController";
-    private static final String KEY_FEATURE_CONTROLS_GROUP = "feature_controls_group";
+    private static final String KEY_SPATIAL_AUDIO_GROUP = "spatial_audio_group";
     private static final String KEY_SPATIAL_AUDIO = "spatial_audio";
     private static final String KEY_HEAD_TRACKING = "head_tracking";
 
@@ -98,7 +95,7 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont
 
     @Override
     public String getPreferenceKey() {
-        return KEY_FEATURE_CONTROLS_GROUP;
+        return KEY_SPATIAL_AUDIO_GROUP;
     }
 
     @Override
@@ -112,7 +109,6 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont
         SwitchPreference spatialAudioPref = mProfilesContainer.findPreference(KEY_SPATIAL_AUDIO);
         if (spatialAudioPref == null) {
             spatialAudioPref = createSpatialAudioPreference(mProfilesContainer.getContext());
-            spatialAudioPref.setOrder(FEATURE_SPATIAL_AUDIO_ORDER);
             mProfilesContainer.addPreference(spatialAudioPref);
         }
 
@@ -123,7 +119,6 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont
         SwitchPreference headTrackingPref = mProfilesContainer.findPreference(KEY_HEAD_TRACKING);
         if (headTrackingPref == null) {
             headTrackingPref = createHeadTrackingPreference(mProfilesContainer.getContext());
-            headTrackingPref.setOrder(FEATURE_HEAD_TRACKING_ORDER);
             mProfilesContainer.addPreference(headTrackingPref);
         }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index 8eaff45b400..b4bb0ff62cd 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -65,8 +65,6 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
 
     static final int FEATURE_HEARING_DEVICE_CONTROLS_ORDER = 1;
     static final int FEATURE_AUDIO_ROUTING_ORDER = 2;
-    static final int FEATURE_SPATIAL_AUDIO_ORDER = 3;
-    static final int FEATURE_HEAD_TRACKING_ORDER = 4;
 
     @VisibleForTesting
     static int EDIT_DEVICE_NAME_ITEM_ID = Menu.FIRST;