Merge cherrypicks of ['ag/20892054'] into tm-qpr2-release.android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-release

Change-Id: I83e4cb510accac95e3c2ff2c50177e70c789980d

2 files changed, 8 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 3117053..4e6dccf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,6 +13,14 @@ android_app_import {
         "preinstalled-packages-com.android.car.dialer.xml",
     ],
     overrides: ["Dialer"],
+    // 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
+    // set to optional we can use the following flag to ignore the build error.
+    optional_uses_libs: [
+        "androidx.window.extensions",
+        "androidx.window.sidecar"
+    ]
 }
 
 prebuilt_etc {
diff --git a/CarDialerApp.apk b/CarDialerApp.apk
index 933663c..1ccf870 100644
--- a/CarDialerApp.apk
+++ b/CarDialerApp.apk