Tweak lunch choice for git_main We add "trunk_staging-" in our COMMON_LUNCH_CHOICES so it will be a valid target in the way trunk stable lunch targets are parsed. Bug: 307738446 Test: None Change-Id: I005b8d16c5bab23f7e456ec71a2e062bfd5199c7