[bt] Add the Google module in pixel image

Flag: EXEMPT adding Google module to build is not flagged
Test: presubmit
Test: m then flash device then check Bluetooth version & functionality
Ignore-AOSP-First: We must change the apex configuration for pixel at
                   the same time to prevent breaking tip-of-tree
Bug: 383863941
Change-Id: If3ec0ce5bd6243721680510e2c7078ad61c2f0a3

59 files changed, 73 insertions, 181 deletions

diff --git a/AndroidTestTemplate.xml b/AndroidTestTemplate.xml
index 8332422b34..4083baac14 100644
--- a/AndroidTestTemplate.xml
+++ b/AndroidTestTemplate.xml
@@ -39,7 +39,7 @@
   <!-- Only run tests in MTS if the Bluetooth Mainline module is installed. -->
   <object type="module_controller"
           class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-      <option name="mainline-module-package-name" value="com.android.btservices" />
-      <option name="mainline-module-package-name" value="com.google.android.btservices" />
+      <option name="mainline-module-package-name" value="com.android.bt" />
+      <option name="mainline-module-package-name" value="com.google.android.bt" />
   </object>
 </configuration>
diff --git a/android/app/tests/unit/AndroidTest.xml b/android/app/tests/unit/AndroidTest.xml
index 212b245d6e..5ac9bd5608 100644
--- a/android/app/tests/unit/AndroidTest.xml
+++ b/android/app/tests/unit/AndroidTest.xml
@@ -55,6 +55,6 @@
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
         <option name="enable" value="true" />
-        <option name="mainline-module-package-name" value="com.android.btservices" />
+        <option name="mainline-module-package-name" value="com.android.bt" />
     </object>
 </configuration>
diff --git a/android/app/tests/unit/GoogleAndroidTest.xml b/android/app/tests/unit/GoogleAndroidTest.xml
index 61a5011c8f..bcda5eacce 100644
--- a/android/app/tests/unit/GoogleAndroidTest.xml
+++ b/android/app/tests/unit/GoogleAndroidTest.xml
@@ -51,6 +51,6 @@
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
         <option name="enable" value="true" />
-        <option name="mainline-module-package-name" value="com.google.android.btservices" />
+        <option name="mainline-module-package-name" value="com.google.android.bt" />
     </object>
 </configuration>
diff --git a/android/pandora/gen_cov.py b/android/pandora/gen_cov.py
index 85ed6c6a6d..02debb71ee 100755
--- a/android/pandora/gen_cov.py
+++ b/android/pandora/gen_cov.py
@@ -310,8 +310,8 @@ if __name__ == '__main__':
   parser = argparse.ArgumentParser()
   parser.add_argument(
       '--apex-name',
-      default='com.android.btservices',
-      help='bluetooth apex name. Default: com.android.btservices')
+      default='com.android.bt',
+      help='bluetooth apex name. Default: com.android.bt')
   parser.add_argument(
       '--java', action='store_true', help='generate Java coverage')
   parser.add_argument(
diff --git a/android/pandora/server/configs/PtsBotTestMts.xml b/android/pandora/server/configs/PtsBotTestMts.xml
index 168eee7dea..00fb46bfbd 100644
--- a/android/pandora/server/configs/PtsBotTestMts.xml
+++ b/android/pandora/server/configs/PtsBotTestMts.xml
@@ -73,7 +73,7 @@
 
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-        <option name="mainline-module-package-name" value="com.android.btservices" />
-        <option name="mainline-module-package-name" value="com.google.android.btservices" />
+        <option name="mainline-module-package-name" value="com.android.bt" />
+        <option name="mainline-module-package-name" value="com.google.android.bt" />
     </object>
 </configuration>
diff --git a/apex/Android.bp b/apex/Android.bp
index 4eccda2a11..6cc95be562 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -23,39 +23,13 @@ linker_config {
 }
 
 // Legacy Bluetooth apex prior to Baklava
+// This is kept for soong purposes but this apex doesn't do anything anymore
 // TODO b/383863941 delete
 apex {
     name: "com.android.btservices",
     defaults: ["t-launched-apex-module"],
     manifest: "apex_manifest.json",
-    bootclasspath_fragments: ["com.android.btservices-bootclasspath-fragment"],
-    systemserverclasspath_fragments: ["com.android.btservices-systemserverclasspath-fragment"],
-    compat_configs: [
-        "bluetooth-compat-config",
-        "bluetoothapk-platform-compat-config",
-        "framework-bluetooth-compat-config",
-    ],
-    apps: ["Bluetooth"],
-
-    multilib: {
-        first: {
-            // Extractor process runs only with the primary ABI.
-            jni_libs: [
-                "libbluetooth_jni",
-            ],
-        },
-    },
 
-    prebuilts: [
-        "audio_set_configurations_bfbs",
-        "audio_set_configurations_json",
-        "audio_set_scenarios_bfbs",
-        "audio_set_scenarios_json",
-        "bt_did.conf",
-        "bt_stack.conf",
-        "btservices-linker-config",
-        "interop_database.conf",
-    ],
     key: "com.android.btservices.key",
     certificate: ":com.android.btservices.certificate",
     updatable: true,
@@ -83,62 +57,6 @@ sdk {
     ],
 }
 
-// Encapsulate the contributions made by the com.android.bluetooth to the bootclasspath.
-bootclasspath_fragment {
-    name: "com.android.btservices-bootclasspath-fragment",
-    contents: ["framework-bluetooth"],
-    apex_available: ["com.android.btservices"],
-
-    // The bootclasspath_fragments that provide APIs on which this depends.
-    fragments: [
-        {
-            apex: "com.android.art",
-            module: "art-bootclasspath-fragment",
-        },
-    ],
-
-    // Additional stubs libraries that this fragment's contents use which are
-    // not provided by another bootclasspath_fragment.
-    additional_stubs: [
-        "android-non-updatable",
-    ],
-
-    // Additional hidden API flag files to override the defaults. This must only be
-    // modified by the Soong or platform compat team.
-    hidden_api: {
-        max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
-        max_target_r_low_priority: ["hiddenapi/hiddenapi-max-target-r-low-priority.txt"],
-        unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
-
-        // The following packages contain classes from other modules on the
-        // bootclasspath. That means that the hidden API flags for this module
-        // has to explicitly list every single class this module provides in
-        // that package to differentiate them from the classes provided by other
-        // modules. That can include private classes that are not part of the
-        // API.
-        split_packages: [
-            "android.bluetooth",
-        ],
-
-        // The following packages and all their subpackages currently only
-        // contain classes from this bootclasspath_fragment. Listing a package
-        // here won't prevent other bootclasspath modules from adding classes in
-        // any of those packages but it will prevent them from adding those
-        // classes into an API surface, e.g. public, system, etc.. Doing so will
-        // result in a build failure due to inconsistent flags.
-        package_prefixes: [
-            "android.bluetooth.le",
-            "com.android.bluetooth",
-        ],
-    },
-}
-
-systemserverclasspath_fragment {
-    name: "com.android.btservices-systemserverclasspath-fragment",
-    standalone_contents: ["service-bluetooth"],
-    apex_available: ["com.android.btservices"],
-}
-
 // Mainline bluetooth apex module.
 apex {
     name: "com.android.bt",
@@ -242,6 +160,6 @@ bootclasspath_fragment {
 
 systemserverclasspath_fragment {
     name: "com.android.bt-systemserverclasspath-fragment",
-    standalone_contents: ["service-bluetooth-new"],
+    standalone_contents: ["service-bluetooth"],
     apex_available: ["com.android.bt"],
 }
diff --git a/flags/Android.bp b/flags/Android.bp
index f43322d4ed..3695db34ad 100644
--- a/flags/Android.bp
+++ b/flags/Android.bp
@@ -6,7 +6,7 @@ package {
 aconfig_declarations {
     name: "bluetooth_aconfig_flags",
     package: "com.android.bluetooth.flags",
-    container: "com.android.btservices",
+    container: "com.android.bt",
     visibility: ["//packages/modules/Bluetooth/framework"],
     // LINT.IfChange
     srcs: [
diff --git a/flags/a2dp.aconfig b/flags/a2dp.aconfig
index e6275bf010..06d46a7f76 100644
--- a/flags/a2dp.aconfig
+++ b/flags/a2dp.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "bta_av_use_peer_codec"
diff --git a/flags/active_device_manager.aconfig b/flags/active_device_manager.aconfig
index fefcdd1d87..61637d83a2 100644
--- a/flags/active_device_manager.aconfig
+++ b/flags/active_device_manager.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "adm_fallback_when_wired_audio_disconnected"
diff --git a/flags/adapter.aconfig b/flags/adapter.aconfig
index f355113fe0..f6bf65e1f6 100644
--- a/flags/adapter.aconfig
+++ b/flags/adapter.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "adapter_properties_looper"
diff --git a/flags/avrcp.aconfig b/flags/avrcp.aconfig
index 5e806efb11..7a30583c07 100644
--- a/flags/avrcp.aconfig
+++ b/flags/avrcp.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "abs_volume_sdp_conflict"
diff --git a/flags/avrcp_controller.aconfig b/flags/avrcp_controller.aconfig
index 4374eef8fa..be732ee1ad 100644
--- a/flags/avrcp_controller.aconfig
+++ b/flags/avrcp_controller.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "uncache_player_when_browsed_player_changes"
diff --git a/flags/bta_dm.aconfig b/flags/bta_dm.aconfig
index e0ed3358b6..66600cbc0d 100644
--- a/flags/bta_dm.aconfig
+++ b/flags/bta_dm.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "bta_dm_defer_device_discovery_state_change_until_rnr_complete"
diff --git a/flags/btif_dm.aconfig b/flags/btif_dm.aconfig
index 2f16904b8f..b8802a9db1 100644
--- a/flags/btif_dm.aconfig
+++ b/flags/btif_dm.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "bond_transport_after_bond_cancel_fix"
diff --git a/flags/btm_ble.aconfig b/flags/btm_ble.aconfig
index 0922fd1aa0..2413c74be1 100644
--- a/flags/btm_ble.aconfig
+++ b/flags/btm_ble.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "floss_separate_host_privacy_and_llprivacy"
diff --git a/flags/connectivity.aconfig b/flags/connectivity.aconfig
index 80efed1aa2..10c9f417e2 100644
--- a/flags/connectivity.aconfig
+++ b/flags/connectivity.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "api_get_connection_state_using_identity_address"
diff --git a/flags/device_iot_config.aconfig b/flags/device_iot_config.aconfig
index 77ede517d4..a0fe92c9d3 100644
--- a/flags/device_iot_config.aconfig
+++ b/flags/device_iot_config.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "device_iot_config_logging"
diff --git a/flags/dis.aconfig b/flags/dis.aconfig
index f96d6c3b5f..ace19bca21 100644
--- a/flags/dis.aconfig
+++ b/flags/dis.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "queue_dis_requests"
diff --git a/flags/framework.aconfig b/flags/framework.aconfig
index 3a797af994..41cad78226 100644
--- a/flags/framework.aconfig
+++ b/flags/framework.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "support_metadata_device_types_apis"
diff --git a/flags/gap.aconfig b/flags/gap.aconfig
index 85df1c76d3..a6f04e43be 100644
--- a/flags/gap.aconfig
+++ b/flags/gap.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "encrypted_advertising_data"
diff --git a/flags/gatt.aconfig b/flags/gatt.aconfig
index 99b0305291..2de46293ac 100644
--- a/flags/gatt.aconfig
+++ b/flags/gatt.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "default_gatt_transport"
diff --git a/flags/hal.aconfig b/flags/hal.aconfig
index 286d1fceb4..e0da661dff 100644
--- a/flags/hal.aconfig
+++ b/flags/hal.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "audio_port_binder_inherit_rt"
diff --git a/flags/hap.aconfig b/flags/hap.aconfig
index 3ce320f88d..634000d0bd 100644
--- a/flags/hap.aconfig
+++ b/flags/hap.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "aics_api"
diff --git a/flags/hci.aconfig b/flags/hci.aconfig
index 79da26788b..cdd5ca3ab6 100644
--- a/flags/hci.aconfig
+++ b/flags/hci.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "encryption_change_v2"
diff --git a/flags/hfp.aconfig b/flags/hfp.aconfig
index 96985f2750..6e94769878 100644
--- a/flags/hfp.aconfig
+++ b/flags/hfp.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "auto_connect_on_multiple_hfp_when_no_a2dp_device"
diff --git a/flags/hfpclient.aconfig b/flags/hfpclient.aconfig
index ded90b3578..c134baac7e 100644
--- a/flags/hfpclient.aconfig
+++ b/flags/hfpclient.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "hfp_client_disconnecting_state"
diff --git a/flags/hid.aconfig b/flags/hid.aconfig
index 6336ac3b10..fe3fa78ec8 100644
--- a/flags/hid.aconfig
+++ b/flags/hid.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "break_uhid_polling_early"
diff --git a/flags/l2cap.aconfig b/flags/l2cap.aconfig
index fb53c10bef..7e1ca0b016 100644
--- a/flags/l2cap.aconfig
+++ b/flags/l2cap.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "l2cap_tx_complete_cb_info"
diff --git a/flags/le_advertising.aconfig b/flags/le_advertising.aconfig
index 524d0461e5..56f849ab7a 100644
--- a/flags/le_advertising.aconfig
+++ b/flags/le_advertising.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "nrpa_non_connectable_adv"
diff --git a/flags/leaudio.aconfig b/flags/leaudio.aconfig
index 5208564fd5..df77064596 100644
--- a/flags/leaudio.aconfig
+++ b/flags/leaudio.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "leaudio_broadcast_monitor_source_sync_status"
diff --git a/flags/mapclient.aconfig b/flags/mapclient.aconfig
index 97d0411683..fe8f90d81d 100644
--- a/flags/mapclient.aconfig
+++ b/flags/mapclient.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "handle_delivery_sending_failure_events"
diff --git a/flags/mcp.aconfig b/flags/mcp.aconfig
index 430bacd761..80567acae7 100644
--- a/flags/mcp.aconfig
+++ b/flags/mcp.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "mcp_allow_play_without_active_player"
diff --git a/flags/metric.aconfig b/flags/metric.aconfig
index f0c62e37fc..e8b8628ba2 100644
--- a/flags/metric.aconfig
+++ b/flags/metric.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "bluetooth_power_telemetry"
diff --git a/flags/opp.aconfig b/flags/opp.aconfig
index 6e32ab0b75..7a03aaff5a 100644
--- a/flags/opp.aconfig
+++ b/flags/opp.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "opp_start_activity_directly_from_notification"
diff --git a/flags/pairing.aconfig b/flags/pairing.aconfig
index 9d98aa158a..b66b02939d 100644
--- a/flags/pairing.aconfig
+++ b/flags/pairing.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "clear_auth_collision_state_on_pairing_complete"
diff --git a/flags/pbapclient.aconfig b/flags/pbapclient.aconfig
index dbbbb7773b..2464557d58 100644
--- a/flags/pbapclient.aconfig
+++ b/flags/pbapclient.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "pbap_client_storage_refactor"
diff --git a/flags/ranging.aconfig b/flags/ranging.aconfig
index 6b75003163..7851d5ff82 100644
--- a/flags/ranging.aconfig
+++ b/flags/ranging.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "channel_sounding"
diff --git a/flags/rfcomm.aconfig b/flags/rfcomm.aconfig
index df53931078..b724d93c7d 100644
--- a/flags/rfcomm.aconfig
+++ b/flags/rfcomm.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "rfcomm_always_use_mitm"
diff --git a/flags/rnr.aconfig b/flags/rnr.aconfig
index 6b19a5f77b..425db568d6 100644
--- a/flags/rnr.aconfig
+++ b/flags/rnr.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "rnr_store_device_type"
diff --git a/flags/sco.aconfig b/flags/sco.aconfig
index 26379f4ea1..51c6e14e24 100644
--- a/flags/sco.aconfig
+++ b/flags/sco.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "fix_sco_command_status_handling"
diff --git a/flags/sdp.aconfig b/flags/sdp.aconfig
index a20adb914a..418fa04663 100644
--- a/flags/sdp.aconfig
+++ b/flags/sdp.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "stack_sdp_detect_nil_property_type"
diff --git a/flags/security.aconfig b/flags/security.aconfig
index 40a6890649..ed5370daa8 100644
--- a/flags/security.aconfig
+++ b/flags/security.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "key_missing_classic_device"
diff --git a/flags/service_discovery.aconfig b/flags/service_discovery.aconfig
index f5569086b9..00c0741ff3 100644
--- a/flags/service_discovery.aconfig
+++ b/flags/service_discovery.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "prevent_duplicate_uuid_intent"
diff --git a/flags/sockets.aconfig b/flags/sockets.aconfig
index 5f00813a8b..e1ba818cef 100644
--- a/flags/sockets.aconfig
+++ b/flags/sockets.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "unix_file_socket_creation_failure"
diff --git a/flags/system_service.aconfig b/flags/system_service.aconfig
index fba0792eca..65caf1e60c 100644
--- a/flags/system_service.aconfig
+++ b/flags/system_service.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "enforce_resolve_system_service_behavior"
diff --git a/flags/vcp.aconfig b/flags/vcp.aconfig
index 43d5ec4c1c..612352219f 100644
--- a/flags/vcp.aconfig
+++ b/flags/vcp.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "vcp_mute_unmute"
diff --git a/flags/vsc.aconfig b/flags/vsc.aconfig
index bd67729689..af4f375849 100644
--- a/flags/vsc.aconfig
+++ b/flags/vsc.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
+container: "com.android.bt"
 
 flag {
     name: "hci_vendor_specific_extension"
diff --git a/framework/tests/bumble/AndroidPhyTest.xml b/framework/tests/bumble/AndroidPhyTest.xml
index 4e5eb02e5f..b762ec7480 100644
--- a/framework/tests/bumble/AndroidPhyTest.xml
+++ b/framework/tests/bumble/AndroidPhyTest.xml
@@ -47,8 +47,8 @@
     <!-- Only run if the Bluetooth Mainline module is installed. -->
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-        <option name="mainline-module-package-name" value="com.android.btservices" />
-        <option name="mainline-module-package-name" value="com.google.android.btservices" />
+        <option name="mainline-module-package-name" value="com.android.bt" />
+        <option name="mainline-module-package-name" value="com.google.android.bt" />
     </object>
 
     <!-- Collect Bluetooth snoop logs for each test run -->
diff --git a/framework/tests/bumble/AndroidTest.xml b/framework/tests/bumble/AndroidTest.xml
index 4855fec134..04aedce061 100644
--- a/framework/tests/bumble/AndroidTest.xml
+++ b/framework/tests/bumble/AndroidTest.xml
@@ -48,8 +48,8 @@
     <!-- Only run if the Bluetooth Mainline module is installed. -->
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-        <option name="mainline-module-package-name" value="com.android.btservices" />
-        <option name="mainline-module-package-name" value="com.google.android.btservices" />
+        <option name="mainline-module-package-name" value="com.android.bt" />
+        <option name="mainline-module-package-name" value="com.google.android.bt" />
     </object>
 
     <!-- Collect Bluetooth snoop logs for each test run -->
diff --git a/framework/tests/unit/AndroidTest.xml b/framework/tests/unit/AndroidTest.xml
index f3e71f3b75..2f675b852e 100644
--- a/framework/tests/unit/AndroidTest.xml
+++ b/framework/tests/unit/AndroidTest.xml
@@ -39,7 +39,7 @@
     <!-- Only run FrameworkBluetoothTests in MTS if the Bluetooth Mainline module is installed. -->
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-        <option name="mainline-module-package-name" value="com.android.btservices" />
-        <option name="mainline-module-package-name" value="com.google.android.btservices" />
+        <option name="mainline-module-package-name" value="com.android.bt" />
+        <option name="mainline-module-package-name" value="com.google.android.bt" />
     </object>
 </configuration>
diff --git a/service/Android.bp b/service/Android.bp
index 5fbf29b91c..9a8e28f130 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -93,7 +93,6 @@ java_library {
 }
 
 // Apply jarjaring before using library in the apex
-// TODO b/383863941 delete and merge with service-bluetooth-new
 java_library {
     name: "service-bluetooth",
     static_libs: ["service-bluetooth-pre-jarjar"],
@@ -113,30 +112,6 @@ java_library {
 
     sdk_version: "system_server_current",
     min_sdk_version: "Tiramisu",
-    apex_available: ["com.android.btservices"],
-    visibility: ["//packages/modules/Bluetooth/apex"],
-}
-
-// Apply jarjaring before using library in the apex
-java_library {
-    name: "service-bluetooth-new",
-    static_libs: ["service-bluetooth-pre-jarjar"],
-    installable: true,
-
-    jarjar_rules: ":bluetooth-jarjar-rules",
-
-    optimize: {
-        enabled: true,
-        shrink: true,
-        proguard_flags_files: ["proguard.flags"],
-    },
-
-    libs: [
-        "framework-bluetooth.impl",
-    ],
-
-    sdk_version: "system_server_current",
-    min_sdk_version: "Tiramisu",
     apex_available: ["com.android.bt"],
     visibility: ["//packages/modules/Bluetooth/apex"],
 }
diff --git a/service/tests/AndroidTest.xml b/service/tests/AndroidTest.xml
index 4e1be42419..c759326927 100644
--- a/service/tests/AndroidTest.xml
+++ b/service/tests/AndroidTest.xml
@@ -28,8 +28,7 @@
 
     <option name="test-suite-tag" value="apct" />
     <option name="test-tag" value="ServiceBluetoothTests" />
-    <option name="config-descriptor:metadata" key="mainline-param"
-            value="com.google.android.btservices.apex" />
+    <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.bt.apex" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.server.bluetooth.test" />
         <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
@@ -39,7 +38,7 @@
     <!-- Only run FrameworkBluetoothTests in MTS if the Bluetooth Mainline module is installed. -->
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-        <option name="mainline-module-package-name" value="com.android.btservices" />
-        <option name="mainline-module-package-name" value="com.google.android.btservices" />
+        <option name="mainline-module-package-name" value="com.android.bt" />
+        <option name="mainline-module-package-name" value="com.google.android.bt" />
     </object>
 </configuration>
diff --git a/system/bta/le_audio/le_audio_set_configuration_provider_json.cc b/system/bta/le_audio/le_audio_set_configuration_provider_json.cc
index 8e22ddb3ff..a76a58bb59 100644
--- a/system/bta/le_audio/le_audio_set_configuration_provider_json.cc
+++ b/system/bta/le_audio/le_audio_set_configuration_provider_json.cc
@@ -51,14 +51,14 @@ namespace bluetooth::le_audio {
 
 #ifdef __ANDROID__
 static const std::vector<std::pair<const char* /*schema*/, const char* /*content*/>>
-        kLeAudioSetConfigs = {{"/apex/com.android.btservices/etc/bluetooth/le_audio/"
+        kLeAudioSetConfigs = {{"/apex/com.android.bt/etc/bluetooth/le_audio/"
                                "audio_set_configurations.bfbs",
-                               "/apex/com.android.btservices/etc/bluetooth/le_audio/"
+                               "/apex/com.android.bt/etc/bluetooth/le_audio/"
                                "audio_set_configurations.json"}};
 static const std::vector<std::pair<const char* /*schema*/, const char* /*content*/>>
-        kLeAudioSetScenarios = {{"/apex/com.android.btservices/etc/bluetooth/"
+        kLeAudioSetScenarios = {{"/apex/com.android.bt/etc/bluetooth/"
                                  "le_audio/audio_set_scenarios.bfbs",
-                                 "/apex/com.android.btservices/etc/bluetooth/"
+                                 "/apex/com.android.bt/etc/bluetooth/"
                                  "le_audio/audio_set_scenarios.json"}};
 #elif defined(TARGET_FLOSS)
 static const std::vector<std::pair<const char* /*schema*/, const char* /*content*/>>
diff --git a/system/btif/src/btif_core.cc b/system/btif/src/btif_core.cc
index 9164e53ef7..f0d06373b6 100644
--- a/system/btif/src/btif_core.cc
+++ b/system/btif/src/btif_core.cc
@@ -80,7 +80,7 @@ using namespace bluetooth;
 #if defined(TARGET_FLOSS)
 #define BTE_DID_CONF_FILE "/var/lib/bluetooth/bt_did.conf"
 #elif defined(__ANDROID__)
-#define BTE_DID_CONF_FILE "/apex/com.android.btservices/etc/bluetooth/bt_did.conf"
+#define BTE_DID_CONF_FILE "/apex/com.android.bt/etc/bluetooth/bt_did.conf"
 #else  // !defined(__ANDROID__)
 #define BTE_DID_CONF_FILE "bt_did.conf"
 #endif  // defined(__ANDROID__)
diff --git a/system/device/src/interop.cc b/system/device/src/interop.cc
index 1c8798e366..e9c3526a63 100644
--- a/system/device/src/interop.cc
+++ b/system/device/src/interop.cc
@@ -55,7 +55,7 @@ using namespace bluetooth;
 #ifdef __ANDROID__
 static const char* INTEROP_DYNAMIC_FILE_PATH = "/data/misc/bluedroid/interop_database_dynamic.conf";
 static const char* INTEROP_STATIC_FILE_PATH =
-        "/apex/com.android.btservices/etc/bluetooth/interop_database.conf";
+        "/apex/com.android.bt/etc/bluetooth/interop_database.conf";
 #elif TARGET_FLOSS
 #include <base/files/file_util.h>
 
diff --git a/system/gd/AndroidTestTemplate.xml b/system/gd/AndroidTestTemplate.xml
index 8332422b34..4083baac14 100644
--- a/system/gd/AndroidTestTemplate.xml
+++ b/system/gd/AndroidTestTemplate.xml
@@ -39,7 +39,7 @@
   <!-- Only run tests in MTS if the Bluetooth Mainline module is installed. -->
   <object type="module_controller"
           class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-      <option name="mainline-module-package-name" value="com.android.btservices" />
-      <option name="mainline-module-package-name" value="com.google.android.btservices" />
+      <option name="mainline-module-package-name" value="com.android.bt" />
+      <option name="mainline-module-package-name" value="com.google.android.bt" />
   </object>
 </configuration>
diff --git a/system/main/stack_config.cc b/system/main/stack_config.cc
index 9b04e7f16c..20db9be13d 100644
--- a/system/main/stack_config.cc
+++ b/system/main/stack_config.cc
@@ -60,7 +60,7 @@ static future_t* init() {
 #if defined(TARGET_FLOSS)
   const char* path = "/etc/bluetooth/bt_stack.conf";
 #elif defined(__ANDROID__)
-  const char* path = "/apex/com.android.btservices/etc/bluetooth/bt_stack.conf";
+  const char* path = "/apex/com.android.bt/etc/bluetooth/bt_stack.conf";
 #else   // !defined(__ANDROID__)
   const char* path = "bt_stack.conf";
 #endif  // defined(__ANDROID__)
diff --git a/system/stack/test/a2dp/AndroidTest.xml b/system/stack/test/a2dp/AndroidTest.xml
index 71fc46cdb9..ace94ad9b8 100644
--- a/system/stack/test/a2dp/AndroidTest.xml
+++ b/system/stack/test/a2dp/AndroidTest.xml
@@ -34,7 +34,7 @@
   <!-- Only run tests in MTS if the Bluetooth Mainline module is installed. -->
   <object type="module_controller"
           class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-      <option name="mainline-module-package-name" value="com.android.btservices" />
-      <option name="mainline-module-package-name" value="com.google.android.btservices" />
+      <option name="mainline-module-package-name" value="com.android.bt" />
+      <option name="mainline-module-package-name" value="com.google.android.bt" />
   </object>
 </configuration>
diff --git a/system/stack/test/a2dp/AndroidTestForce32.xml b/system/stack/test/a2dp/AndroidTestForce32.xml
index c2fa5e44dc..afb13d3266 100644
--- a/system/stack/test/a2dp/AndroidTestForce32.xml
+++ b/system/stack/test/a2dp/AndroidTestForce32.xml
@@ -33,7 +33,7 @@
   <!-- Only run tests in MTS if the Bluetooth Mainline module is installed. -->
   <object type="module_controller"
           class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-      <option name="mainline-module-package-name" value="com.android.btservices" />
-      <option name="mainline-module-package-name" value="com.google.android.btservices" />
+      <option name="mainline-module-package-name" value="com.android.bt" />
+      <option name="mainline-module-package-name" value="com.google.android.bt" />
   </object>
 </configuration>