Snap for 12296955 from 57c609464a8e610bce4dd3c0d249c1aa02ce9bd6 to 24Q4-release

Change-Id: Ib1c5a42a78c7186223e8c8fa99e05ae55fffdcab
diff --git a/Android.bp b/Android.bp
index 6efe391..0124e21 100644
--- a/Android.bp
+++ b/Android.bp
@@ -9,7 +9,6 @@
     privileged: true,
     certificate: "platform",
     required: ["allowed_privapp_com.android.car.messenger"],
-    overrides: ["messaging"],
     // This flag is needed because we're inehriting 2 `uses-library` tags from `androidx.window`
     // that it's coming from Compose support in `car-ui-lib` in the manifest. And Soong is
     // enforcing that both the shared libraries must be in the image. But since both of them are