Revert^2 "Integrate Settings with Preference Service"

This reverts commit b2986f77a4fff560fba23492963645d32bf30bb8.

Reason for revert: Re-introduce change, fixing bad test

Change-Id: Ie4e19b4691b335bab69364d12afb832e8c9b0ce1
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index db2e0d4..2295ee3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5412,6 +5412,17 @@
             </intent-filter>
         </service>
 
+        <!-- Service to expose Preference Metadata and Get/Set functionality -->
+        <service
+            android:name=".service.PreferenceService"
+            android:exported="true"
+            android:featureFlag="com.android.settingslib.flags.settings_catalyst"
+            android:permission="android.permission.READ_SYSTEM_PREFERENCES">
+            <intent-filter>
+                <action android:name="android.service.settings.preferences.action.PREFERENCE_SERVICE" />
+            </intent-filter>
+        </service>
+
         <receiver android:name="com.android.settings.connecteddevice.audiosharing.AudioSharingReceiver"
             android:exported="false">
             <intent-filter>