We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch Change-Id: I66b82de3050ae5758f8092b037f78f259f185914
based on 84d60a2e19d4ad09086067994d2f683ff86f6231 Bug: 263919239 Change-Id: I7be43786325116baddd35e182f87ad15fbe1a6ce