diff --git a/AccountManager/Android.mk b/AccountManager/Android.mk
index 68d4d70afa9663d236966982c3668c688c11d1da..1d85c719174514ea90064e6e440de644c849f7d9 100644
--- a/AccountManager/Android.mk
+++ b/AccountManager/Android.mk
@@ -6,4 +6,8 @@ LOCAL_CERTIFICATE := platform
 LOCAL_SRC_FILES := app-standard-release-unsigned.apk
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
+LOCAL_OPTIONAL_USES_LIBRARIES := androidx.window.extensions \
+                                 androidx.window.sidecar
+endif
 include $(BUILD_PREBUILT)
diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk
index 2698c93b4e2c512f8fd0afda82272f885227ac03..08ecc398460ef2df99c217fdc4308923586a7692 100644
--- a/GmsCore/Android.mk
+++ b/GmsCore/Android.mk
@@ -29,5 +29,7 @@ LOCAL_REQUIRED_MODULES := privapp-permissions-com.google.android.gms.xml
 LOCAL_REQUIRED_MODULES += microg.xml
 ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
 LOCAL_USES_LIBRARIES := com.android.location.provider
+LOCAL_OPTIONAL_USES_LIBRARIES := androidx.window.extensions \
+                                 androidx.window.sidecar
 endif
 include $(BUILD_PREBUILT)