For #12016: Follow ux mock on Settings --> Data Collection

app/src/main/res/xml/data_choices_preferences.xml

@@ -2,21 +2,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.preference.SwitchPreference
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference
         android:key="@string/pref_key_telemetry"
         android:summary="@string/preferences_usage_data_description"
-        android:title="@string/preference_usage_data"
-        app:iconSpaceReserved="false" />
-    <androidx.preference.SwitchPreference
+        android:title="@string/preference_usage_data" />
+    <SwitchPreference
         android:key="@string/pref_key_marketing_telemetry"
         android:summary="@string/preferences_marketing_data_description"
-        android:title="@string/preferences_marketing_data"
-        app:iconSpaceReserved="false" />
-    <androidx.preference.SwitchPreference
+        android:title="@string/preferences_marketing_data" />
+    <SwitchPreference
         android:key="@string/pref_key_experimentation"
         android:summary="@string/preference_experiments_summary"
-        android:title="@string/preference_experiments"
-        app:iconSpaceReserved="false" />
+        android:title="@string/preference_experiments" />
 </PreferenceScreen>