diff --git a/aosp/frameworks/base/packages/StatementService/AndroidManifest.xml b/aosp/frameworks/base/packages/StatementService/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..71ebd7d157c8163f0fd92da59299e661cd4ac493
--- /dev/null
+++ b/aosp/frameworks/base/packages/StatementService/AndroidManifest.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.android.statementservice"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.DOMAIN_VERIFICATION_AGENT"/>
+    <uses-permission android:name="android.permission.INTENT_FILTER_VERIFICATION_AGENT"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION"/>
+
+    <application
+        android:label="@string/service_name"
+        android:allowBackup="false"
+        android:name=".StatementServiceApplication"
+        >
+
+        <receiver
+            android:name=".domain.BootCompletedReceiver"
+            android:exported="true">
+        </receiver>
+
+        <receiver
+            android:name=".domain.DomainVerificationReceiverV1"
+            android:permission="android.permission.BIND_INTENT_FILTER_VERIFIER"
+            android:exported="true"
+            >
+            <intent-filter android:priority="1">
+                <action android:name="android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION"/>
+                <data android:mimeType="application/vnd.android.package-archive"/>
+            </intent-filter>
+        </receiver>
+
+        <!--
+            v2 receiver remains disabled assuming the device ships its own updated version.
+            If necessary, this can be enabled using shell.
+        -->
+        <receiver
+            android:name=".domain.DomainVerificationReceiverV2"
+            android:permission="android.permission.BIND_DOMAIN_VERIFICATION_AGENT"
+            android:directBootAware="true"
+            android:exported="true"
+            android:enabled="false"
+            >
+            <intent-filter android:priority="1">
+                <action android:name="android.intent.action.DOMAINS_NEED_VERIFICATION"/>
+            </intent-filter>
+        </receiver>
+    </application>
+
+</manifest>
diff --git a/aosp/packages/apps/DocumentsUI/AndroidManifest.xml b/aosp/packages/apps/DocumentsUI/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6cdafb106079ddc2da1cb204b7078dda6c01f3a6
--- /dev/null
+++ b/aosp/packages/apps/DocumentsUI/AndroidManifest.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2007-2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.android.documentsui">
+
+    <uses-sdk android:minSdkVersion="29"/>
+
+    <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />
+    <uses-permission android:name="android.permission.REMOVE_TASKS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.CACHE_CONTENT" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES" />
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+    <uses-permission android:name="android.permission.MODIFY_QUIET_MODE" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
+    <!-- Permissions required for reading and logging compat changes -->
+    <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE"/>
+    <uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG"/>
+
+    <uses-permission android:name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
+
+    <!-- Permissions required for reading device configs -->
+    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>
+
+    <application
+        android:name=".DocumentsApplication"
+        android:label="@string/app_label"
+        android:icon="@drawable/app_icon"
+        android:supportsRtl="true"
+        android:allowBackup="true"
+        android:backupAgent=".prefs.BackupAgent"
+        android:fullBackupOnly="false"
+        android:crossProfile="true">
+
+        <meta-data
+            android:name="com.google.android.backup.api_key"
+            android:value="AEdPqrEAAAAInBA8ued0O_ZyYUsVhwinUF-x50NIe9K0GzBW4A" />
+
+        <activity
+            android:name=".picker.PickActivity"
+            android:exported="true"
+            android:theme="@style/LauncherTheme"
+            android:visibleToInstantApps="true">
+            <intent-filter android:priority="100">
+                <action android:name="android.intent.action.OPEN_DOCUMENT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.OPENABLE" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
+            <intent-filter android:priority="100">
+                <action android:name="android.intent.action.CREATE_DOCUMENT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.OPENABLE" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
+            <intent-filter android:priority="100">
+                <action android:name="android.intent.action.GET_CONTENT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.OPENABLE" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
+            <intent-filter android:priority="100">
+                <action android:name="android.intent.action.OPEN_DOCUMENT_TREE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".files.LauncherActivity"
+            android:label="@string/launcher_label"
+            android:icon="@drawable/launcher_icon"
+            android:theme="@android:style/Theme.NoDisplay">
+        </activity>
+
+        <activity
+            android:name=".inspector.InspectorActivity"
+            android:label="@string/menu_inspect"
+            android:icon="@drawable/launcher_icon"
+            android:theme="@style/DocumentsTheme">
+        </activity>
+
+        <!--  Preserve original launcher activity from Nougat. -->
+        <activity-alias
+            android:name=".LauncherActivity"
+            android:targetActivity=".files.LauncherActivity"
+            android:label="@string/launcher_label"
+            android:exported="true"
+            android:icon="@drawable/launcher_icon" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.APP_FILES" />
+            </intent-filter>
+            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
+        </activity-alias>
+
+        <activity
+            android:name=".files.FilesActivity"
+            android:documentLaunchMode="intoExisting"
+            android:exported="true"
+            android:theme="@style/LauncherTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.document/root" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.document/directory" />
+            </intent-filter>
+        </activity>
+
+        <activity-alias android:name=".ViewDownloadsActivity"
+                        android:targetActivity=".files.FilesActivity"
+                        android:exported="true"
+                        android:enabled="@bool/handle_view_downloads_intent">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW_DOWNLOADS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity-alias>
+
+        <activity
+            android:name=".ScopedAccessActivity"
+            android:exported="true"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar">
+            <intent-filter>
+                <action android:name="android.os.storage.action.OPEN_EXTERNAL_DIRECTORY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <provider
+            android:name=".picker.LastAccessedProvider"
+            android:authorities="com.android.documentsui.lastAccessed"
+            android:exported="false"/>
+
+        <provider
+            android:name=".picker.PickCountRecordProvider"
+            android:authorities="com.android.documentsui.pickCountRecord"
+            android:exported="false"/>
+
+        <provider
+            android:name=".archives.ArchivesProvider"
+            android:authorities="com.android.documentsui.archives"
+            android:grantUriPermissions="true"
+            android:permission="android.permission.MANAGE_DOCUMENTS"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
+            </intent-filter>
+        </provider>
+
+        <receiver android:name=".PackageReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
+                <action android:name="android.intent.action.PACKAGE_DATA_CLEARED" />
+                <data android:scheme="package" />
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name=".roots.BootReceiver" android:enabled="false"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name=".PreBootReceiver"
+            android:exported="true">
+        </receiver>
+
+        <!-- Run FileOperationService in a separate process so that we can use FileLock class to
+            wait until jumbo clip is done writing to disk before reading it. See ClipStorage for
+            details. -->
+        <service
+            android:name=".services.FileOperationService"
+            android:exported="false"
+            android:foregroundServiceType="dataSync"
+            android:process=":com.android.documentsui.services">
+        </service>
+
+        <activity
+            android:name=".selection.demo.SelectionDemoActivity"
+            android:label="Selection Demo"
+            android:exported="true"
+            android:theme="@style/DocumentsTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
+    </application>
+</manifest>
diff --git a/aosp/packages/modules/AdServices/adservices/apk/AdExtServicesManifest.xml b/aosp/packages/modules/AdServices/adservices/apk/AdExtServicesManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b98c385b6ef20cd9d31876836cd67317ece14374
--- /dev/null
+++ b/aosp/packages/modules/AdServices/adservices/apk/AdExtServicesManifest.xml
@@ -0,0 +1,526 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="android.ext.services"
+    android:versionCode="309999900"
+    android:versionName="2019-09"
+    coreApp="true">
+
+    <!-- Declare the broadcast as protected so only the system service can send it.  The AdServices
+    System Service will send this broadcast to the AdServices module where there is a package
+    change.-->
+    <protected-broadcast android:name="com.android.ext.adservices.PACKAGE_CHANGED"/>
+
+    <!-- Allows the system service to query app status-->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+
+    <!-- Permissions required for reading device configs -->
+    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>
+
+    <!-- Used for reporting -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <!-- Used for scheduling connectivity jobs -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <!-- Allows an application to access AdServices Topics API. -->
+    <permission android:name="android.permission.ACCESS_ADSERVICES_TOPICS"
+                android:label="@string/permlab_accessAdServicesTopics"
+                android:description="@string/permdesc_accessAdServicesTopics"
+                android:protectionLevel="normal"/>
+
+    <!-- Allows an application to access AdServices Attribution APIs. -->
+    <permission android:name="android.permission.ACCESS_ADSERVICES_ATTRIBUTION"
+                android:label="@string/permlab_accessAdServicesAttribution"
+                android:description="@string/permdesc_accessAdServicesAttribution"
+                android:protectionLevel="normal"/>
+
+    <!-- Allows an application to access AdServices Custom Audience APIs. -->
+    <permission android:name="android.permission.ACCESS_ADSERVICES_CUSTOM_AUDIENCE"
+                android:label="@string/permlab_accessAdServicesCustomAudience"
+                android:description="@string/permdesc_accessAdServicesCustomAudience"
+                android:protectionLevel="normal"/>
+
+    <!-- Allows an application to access AdServices Ad Id API. -->
+    <permission android:name="android.permission.ACCESS_ADSERVICES_AD_ID"
+                android:label="@string/permlab_accessAdServicesAdId"
+                android:description="@string/permdesc_accessAdServicesAdId"
+                android:protectionLevel="normal"/>
+
+    <!-- Note: Signature permissions for AdServices code running in ExtServices APK must be
+    redefined with the suffix _COMPAT since the ExtServices and AdServices APKs are signed by
+    different keys. -->
+
+    <!-- Allows AdServices to access API for Ad ID. -->
+    <permission android:name="android.permission.ACCESS_PRIVILEGED_AD_ID_COMPAT"
+                android:label="@string/permlab_adServicesAccessAdId"
+                android:description="@string/permdesc_adServicesAccessAdId"
+                android:protectionLevel="signature"/>
+
+    <!-- Allows AdServices to access API for App set ID. -->
+    <permission android:name="android.permission.ACCESS_PRIVILEGED_APP_SET_ID_COMPAT"
+                android:label="@string/permlab_adServicesAccessAppSetId"
+                android:description="@string/permdesc_adServicesAccessAppSetId"
+                android:protectionLevel="signature"/>
+
+    <!-- Allows AdServices to access API for AdServices Cobalt upload. -->
+    <permission android:name="android.permission.ACCESS_PRIVILEGED_ADSERVICES_COBALT_UPLOAD_COMPAT"
+                android:label="@string/permlab_adServicesAccessAdServicesCobaltUpload"
+                android:description="@string/permdesc_adServicesAccessAdServicesCobaltUpload"
+                android:protectionLevel="signature"/>
+
+    <!-- Allows the caller to modify AdService's state via Common Service. -->
+    <permission android:name="android.permission.MODIFY_ADSERVICES_STATE_COMPAT"
+                android:label="@string/permlab_modifyAdServicesState"
+                android:description="@string/permdesc_modifyAdServicesState"
+                android:protectionLevel="signature|configurator"/>
+
+    <!-- Allows the caller to get AdService's state via Common Service. -->
+    <permission android:name="android.permission.ACCESS_ADSERVICES_STATE_COMPAT"
+                android:label="@string/permlab_accessAdServicesState"
+                android:description="@string/permdesc_accessAdServicesState"
+                android:protectionLevel="signature|configurator"/>
+
+    <!-- Permission to allow calling updating AdId Cache API via Common Service. -->
+    <permission android:name="android.permission.UPDATE_PRIVILEGED_AD_ID_COMPAT"
+                android:label="@string/permlab_updateAdservicesAdId"
+                android:description="@string/permdesc_updateAdservicesAdId"
+                android:protectionLevel="signature|configurator"/>
+
+    <uses-permission android:name="android.permission.ACCESS_PRIVILEGED_AD_ID_COMPAT"/>
+    <uses-permission android:name="android.permission.ACCESS_PRIVILEGED_APP_SET_ID_COMPAT"/>
+    <uses-permission android:name="android.permission.ACCESS_PRIVILEGED_ADSERVICES_COBALT_UPLOAD_COMPAT" />
+
+    <!-- Permission to allow self calling Common Service. -->
+    <uses-permission android:name="android.permission.ACCESS_ADSERVICES_STATE_COMPAT"/>
+    <uses-permission android:name="android.permission.MODIFY_ADSERVICES_STATE_COMPAT"/>
+
+    <!-- Allows JobScheduler to persist jobs across reboot. -->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+
+    <application
+        android:name=".ExtServicesApplication"
+        android:label="@string/app_name"
+        android:forceQueryable="true"
+        android:allowBackup="false"
+        android:supportsRtl="true"
+        android:icon="@drawable/ic_android_icon"
+        android:theme="@style/FilterTouches">
+        <!-- Activity for the main view of Adservices Settings UI-->
+        <activity
+            android:name="com.android.adservices.ui.settings.activities.AdServicesSettingsMainActivity"
+            android:exported="true"
+            android:enabled="false"
+            android:theme="@style/Theme.SubSettingsBase"
+            android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.ui.SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <!-- Activity for the topics view of Adservices Settings UI-->
+        <activity
+            android:name="com.android.adservices.ui.settings.activities.TopicsActivity"
+            android:exported="true"
+            android:enabled="false"
+            android:theme="@style/Theme.SubSettingsBase"
+            android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.ui.TOPICS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <!-- Activity for the blocked topics view of Adservices Settings UI-->
+        <activity
+            android:name="com.android.adservices.ui.settings.activities.BlockedTopicsActivity"
+            android:exported="true"
+            android:enabled="false"
+            android:theme="@style/Theme.SubSettingsBase"
+            android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.ui.BLOCKED_TOPICS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <!-- Activity for the apps view of Adservices Settings UI-->
+        <activity
+            android:name="com.android.adservices.ui.settings.activities.AppsActivity"
+            android:exported="true"
+            android:enabled="false"
+            android:theme="@style/Theme.SubSettingsBase"
+            android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.ui.APPS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <!-- Activity for the blocked apps view of Adservices Settings UI-->
+        <activity
+            android:name="com.android.adservices.ui.settings.activities.BlockedAppsActivity"
+            android:exported="true"
+            android:enabled="false"
+            android:theme="@style/Theme.SubSettingsBase"
+            android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.ui.BLOCKED_APPS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <!-- Activity for the ads measurement view of AdServices Settings UI-->
+        <activity
+            android:name="com.android.adservices.ui.settings.activities.MeasurementActivity"
+            android:exported="true"
+            android:enabled="false"
+            android:theme="@style/Theme.SubSettingsBase"
+            android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.ui.MEASUREMENT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <!-- Activity for Adservices Detailed Notification UI -->
+        <activity
+            android:name="com.android.adservices.ui.notifications.ConsentNotificationActivity"
+            android:exported="true"
+            android:enabled="false"
+            android:theme="@style/AdServices.NotificationTheme"
+            android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.ui.NOTIFICATIONS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <!-- Activity for Adservices to run shell command. This is disabled by default.-->
+        <activity
+            android:name="com.android.adservices.shell.ShellCommandActivity"
+            android:exported="true"
+            android:enabled="false"
+            android:theme="@style/Theme.SubSettingsBase"
+            android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.BACK_COMPACT_SHELL_COMMAND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <service android:name="com.android.adservices.adselection.AdSelectionService"
+                 android:exported="true"
+                 android:visibleToInstantApps="false"
+                 android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.adselection.AD_SELECTION_SERVICE"/>
+            </intent-filter>
+        </service>
+
+        <service android:name=
+                     "com.android.adservices.customaudience.CustomAudienceService"
+                 android:exported="true"
+                 android:visibleToInstantApps="false"
+                 android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name=
+                            "android.adservices.customaudience.CUSTOM_AUDIENCE_SERVICE"/>
+            </intent-filter>
+        </service>
+
+        <service android:name=
+                     "android.adservices.signals.ProtectedSignalsService"
+                 android:exported="true"
+                 android:visibleToInstantApps="false"
+                 android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name=
+                            "android.adservices.signals.PROTECTED_SIGNALS_SERVICE"/>
+            </intent-filter>
+        </service>
+
+        <service android:name="com.android.adservices.topics.TopicsService"
+                 android:exported="true"
+                 android:visibleToInstantApps="false"
+                 android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.TOPICS_SERVICE"/>
+            </intent-filter>
+        </service>
+
+        <service android:name="com.android.adservices.adid.AdIdService"
+                 android:exported="true"
+                 android:visibleToInstantApps="false"
+                 android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.ADID_SERVICE"/>
+            </intent-filter>
+        </service>
+
+        <service android:name="com.android.adservices.appsetid.AppSetIdService"
+                 android:exported="true"
+                 android:visibleToInstantApps="false"
+                 android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.APPSETID_SERVICE"/>
+            </intent-filter>
+        </service>
+
+        <service android:name="com.android.adservices.measurement.MeasurementService"
+                 android:exported="true"
+                 android:visibleToInstantApps="false"
+                 android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.MEASUREMENT_SERVICE"/>
+            </intent-filter>
+        </service>
+
+        <service android:name="com.android.adservices.common.AdServicesCommonService"
+                 android:exported="true"
+                 android:visibleToInstantApps="false"
+                 android:process=".adservices">
+            <intent-filter android:priority="1">
+                <action android:name="android.adservices.AD_SERVICES_COMMON_SERVICE"/>
+            </intent-filter>
+        </service>
+
+        <!-- Daily maintenance Job. -->
+        <service android:name="com.android.adservices.service.MaintenanceJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Epoch computation Job. -->
+        <service android:name="com.android.adservices.service.topics.EpochJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Mdd background Job. -->
+        <service android:name="com.android.adservices.download.MddJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Encryption key fetch job. -->
+        <service android:name="com.android.adservices.service.encryptionkey.EncryptionKeyJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Enable Notification Job. -->
+        <service android:name="com.android.adservices.service.common.ConsentNotificationJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Measurement event main report upload job. -->
+        <service
+            android:name="com.android.adservices.service.measurement.reporting.EventReportingJobService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:process=".adservices">
+        </service>
+
+        <!-- Measurement debug report upload job. -->
+        <service android:name=
+                     "com.android.adservices.service.measurement.reporting.DebugReportingJobService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:process=".adservices">
+        </service>
+
+        <!-- Measurement verbose debug report upload job. -->
+        <service android:name=
+              "com.android.adservices.service.measurement.reporting.VerboseDebugReportingJobService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:process=".adservices">
+        </service>
+
+        <!-- Measurement event fallback report upload job. -->
+        <service android:name=
+                     "com.android.adservices.service.measurement.reporting.EventFallbackReportingJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Measurement aggregate main report upload job. -->
+        <service android:name=
+                     "com.android.adservices.service.measurement.reporting.AggregateReportingJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Measurement aggregate fallback report upload job. -->
+        <service android:name=
+                     "com.android.adservices.service.measurement.reporting.AggregateFallbackReportingJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Measurement Attribution Job.-->
+        <service android:name=
+                     "com.android.adservices.service.measurement.attribution.AttributionJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+        <!-- Measurement Attribution Fallback Job.-->
+        <service android:name=
+                     "com.android.adservices.service.measurement.attribution.AttributionFallbackJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Deletion Job.-->
+        <service android:name=
+                     "com.android.adservices.service.measurement.DeleteExpiredJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Measurement Deletion Uninstalled Apps Job. -->
+        <service android:name=
+                     "com.android.adservices.service.measurement.DeleteUninstalledJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- FLEDGE Background Fetch Job -->
+        <service android:name=
+                     "com.android.adservices.service.customaudience.BackgroundFetchJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- FLEDGE Schedule Custom Audience Update Job -->
+        <service android:name=
+                     "com.android.adservices.service.customaudience.ScheduleCustomAudienceUpdateJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- FLEDGE Ad selection debug report sender Job -->
+        <service android:name=
+                     "com.android.adservices.service.adselection.DebugReportSenderJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- FLEDGE Protected Signals periodic encoding job -->
+        <service android:name=
+                     "com.android.adservices.service.signals.PeriodicEncodingJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- FLEDGE KAnon sign join background job -->
+        <service android:name=
+                     "com.android.adservices.service.kanon.KAnonSignJoinBackgroundJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- FLEDGE Background Key Fetch Job -->
+        <service android:name=
+                     "com.android.adservices.service.adselection.encryption.BackgroundKeyFetchJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Measurement Registration Job -->
+        <service android:name=
+                     "com.android.adservices.service.measurement.registration.AsyncRegistrationQueueJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+        <!-- Measurement Registration Fallback Job -->
+        <service android:name=
+                     "com.android.adservices.service.measurement.registration.AsyncRegistrationFallbackJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Measurement Verbose Debug Reporting Fallback Job. -->
+        <service android:name=
+                     "com.android.adservices.service.measurement.reporting.VerboseDebugReportingFallbackJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Measurement Debug Reporting Fallback Job. -->
+        <service android:name=
+                     "com.android.adservices.service.measurement.reporting.DebugReportingFallbackJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:process=".adservices">
+        </service>
+
+        <!-- Cobalt Logging Job -->
+        <service android:name="com.android.adservices.cobalt.CobaltJobService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:process=".adservices">
+        </service>
+
+        <provider
+            android:name=
+                "com.android.adservices.service.measurement.attribution.TriggerContentProvider"
+            android:authorities="com.android.ext.adservices.provider.trigger"
+            android:exported="false"
+            android:process=".adservices"
+        />
+
+        <provider
+            android:name=
+                "com.android.adservices.service.measurement.registration.AsyncRegistrationContentProvider"
+            android:authorities="com.android.ext.adservices.provider.asyncregistration"
+            android:exported="false"
+            android:process=".adservices"
+        />
+
+        <provider
+            android:name="com.android.adservices.service.common.AdServicesInternalProvider"
+            android:authorities="com.android.ext.adservices.provider.internal"
+            android:exported="false"
+            android:process=".adservices"
+        />
+
+        <!-- Boot completed receiver registers package changed event receivers. -->
+        <receiver android:name="com.android.adservices.service.common.AdExtBootCompletedReceiver"
+                  android:enabled="@bool/isAdExtBootCompletedReceiverEnabled"
+                  android:exported="true"
+                  android:process=".adservices">
+        </receiver>
+
+        <!-- On S-, this class handles intents from the system. -->
+        <receiver android:name="com.android.adservices.service.common.PackageChangedReceiver"
+                  android:enabled="false"
+                  android:exported="true"
+                  android:process=".adservices">
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED"/>
+                <action android:name="android.intent.action.PACKAGE_DATA_CLEARED"/>
+                <data android:scheme="package"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- Used and present only on S- -->
+        <uses-library android:name="android.ext.adservices" android:required="false"/>
+    </application>
+</manifest>
diff --git a/aosp/packages/modules/HealthFitness/apk/AndroidManifest.xml b/aosp/packages/modules/HealthFitness/apk/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e1bffd7fab1e04d76f6517b25c2900b9195b58e6
--- /dev/null
+++ b/aosp/packages/modules/HealthFitness/apk/AndroidManifest.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright (C) 2023 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.healthconnect.controller">
+
+    <protected-broadcast android:name="android.health.connect.action.HEALTH_CONNECT_MIGRATION_READY" />
+
+    <uses-permission android:name="android.permission.MANAGE_HEALTH_PERMISSIONS" />
+    <uses-permission android:name="android.permission.MANAGE_HEALTH_DATA" />
+    <uses-permission android:name="android.permission.START_VIEW_PERMISSION_USAGE" />
+    <uses-permission android:name="android.permission.health.READ_EXERCISE_ROUTE" />
+    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
+    <uses-permission android:name="android.permission.LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK" />
+    <uses-permission android:name="android.permission.SEND_SAFETY_CENTER_UPDATE" />
+    <uses-permission android:name="android.permission.health.START_ONBOARDING" />
+    <!-- Used to enable and update safety-center entry points  -->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <!-- Used to show permissions for apps that have not declared VIEW_PERMISSION_USAGE but
+     still have at least one permission granted -->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <!-- Used to disable non system apps from showing overlays -->
+    <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
+
+    <application
+        android:name=".HealthConnectApplication"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_label"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.HealthConnect">
+
+        <activity
+            android:name=".navigation.TrampolineActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:noHistory="true">
+
+            <!-- Deeplink to Home screen -->
+            <intent-filter android:priority="1">
+                <action android:name="android.health.connect.action.HEALTH_HOME_SETTINGS" />
+                <action android:name="android.health.connect.action.MANAGE_HEALTH_DATA" />
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity-alias
+            android:name="PermissionControllerEntryPoint"
+            android:targetActivity=".navigation.TrampolineActivity"
+            android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS"
+            android:exported="true">
+
+            <intent-filter android:priority="1">
+                <action android:name="android.health.connect.action.MANAGE_HEALTH_PERMISSIONS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity-alias>
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="false">
+        </activity>
+
+        <activity-alias
+            android:name="LegacySettingsEntryPoint"
+            android:exported="true"
+            android:targetActivity=".navigation.TrampolineActivity">
+
+            <intent-filter>
+                <action android:name="com.android.settings.action.IA_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <!-- Tell Settings app which category it belongs to -->
+            <meta-data
+                android:name="com.android.settings.category"
+                android:value="com.android.settings.category.ia.privacy" />
+            <meta-data
+                android:name="com.android.settings.title"
+                android:resource="@string/app_label" />
+            <meta-data
+                android:name="com.android.settings.summary"
+                android:resource="@string/health_connect_summary" />
+        </activity-alias>
+
+        <activity
+            android:name=".migration.MigrationActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.health.connect.action.MIGRATION" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".data.DataManagementActivity"
+            android:exported="false">
+        </activity>
+
+        <activity
+            android:name=".permissions.shared.SettingsActivity"
+            android:exported="false">
+        </activity>
+
+        <activity
+            android:name=".permissions.request.PermissionsActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS">
+            <intent-filter android:priority="1">
+                <action android:name="android.health.connect.action.REQUEST_HEALTH_PERMISSIONS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".route.RouteRequestActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:permission="android.permission.health.READ_EXERCISE"
+            android:theme="@style/Theme.HealthConnect">
+            <intent-filter android:priority="1">
+                <action android:name="android.health.connect.action.REQUEST_EXERCISE_ROUTE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".onboarding.OnboardingActivity"
+            android:exported="false"
+            android:theme="@style/Theme.HealthConnect" />
+
+        <activity
+            android:name=".export.ExportFrequencyActivity"
+            android:exported="false"
+            android:theme="@style/Theme.HealthConnect" />
+
+        <provider
+            android:name=".searchindexables.HealthConnectSearchIndexablesProvider"
+            android:authorities="${packageName}"
+            android:exported="true"
+            android:grantUriPermissions="true"
+            android:multiprocess="false"
+            android:permission="android.permission.READ_SEARCH_INDEXABLES">
+            <intent-filter>
+                <action android:name="android.content.action.SEARCH_INDEXABLES_PROVIDER" />
+            </intent-filter>
+        </provider>
+
+        <receiver
+            android:name=".safetycenter.SafetySourceBroadcastReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.safetycenter.action.REFRESH_SAFETY_SOURCES" />
+            </intent-filter>
+        </receiver>
+    </application>
+
+    <queries>
+        <intent>
+            <!-- An intent action to get package visibility into client apps. See more at b/193547946 -->
+            <action android:name="android.intent.action.VIEW_PERMISSION_USAGE" />
+            <category android:name="android.intent.category.HEALTH_PERMISSIONS" />
+        </intent>
+    </queries>
+</manifest>