Merge Android 24Q1 Release (ab/11220357)

Bug: 319669529
Merged-In: I005b8d16c5bab23f7e456ec71a2e062bfd5199c7
Change-Id: Iaec96cd1e6134c2f87565e51e5505e7918427946

populate-new-device.sh

diff --git a/populate-new-device.sh b/populate-new-device.sh
index db5da3d..013e8fe 100755
--- a/populate-new-device.sh
+++ b/populate-new-device.sh
@@ -43,7 +43,7 @@
 
 PRODUCT_MAKEFILES := \$(LOCAL_DIR)/full_$2.mk
 
-COMMON_LUNCH_CHOICES := full_$2-userdebug
+COMMON_LUNCH_CHOICES := full_$2-trunk_staging-userdebug
 EOF
 
 cat > device/$1/$2/full_$2.mk << EOF