Merge tag 'android-13.0.0_r32' into int/13/fp3
Android 13.0.0 release 32
* tag 'android-13.0.0_r32':
Move the modem simulator region to 9600 zone for extra spacing.
modem_simulator: Reuse active call indexes
Bring back setup_wifi interface configuration to T QPR
Allow targets deriving from CF to turn off rename_eth0
Allow targets deriving from CF choosing the interface to setup wifi on.
Add rear display state jetpack mapping
[LPA][Cuttlefish] Add notification pregrant
Adds config values for rear display mode
Make the cluster display private.
Disable background blur for widget picker in cuttlefish
Fix a typo in cuttlefish blur sysprop
Change-Id: Iff4f35d32e23af3ad673990ccdd01884036f7f17
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index d345316..5b94f84 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -36,14 +36,3 @@
aosp_cf_x86_go_phone:$(LOCAL_DIR)/vsoc_x86/go/aosp_cf.mk \
aosp_cf_x86_tv:$(LOCAL_DIR)/vsoc_x86/tv/aosp_cf.mk \
aosp_cf_x86_wear:$(LOCAL_DIR)/vsoc_x86/wear/aosp_cf.mk \
-
-COMMON_LUNCH_CHOICES := \
- aosp_cf_arm64_auto-userdebug \
- aosp_cf_arm64_phone-userdebug \
- aosp_cf_x86_64_pc-userdebug \
- aosp_cf_x86_64_phone-userdebug \
- aosp_cf_x86_64_foldable-userdebug \
- aosp_cf_x86_auto-userdebug \
- aosp_cf_x86_phone-userdebug \
- aosp_cf_x86_tv-userdebug \
- aosp_cf_x86_64_tv-userdebug