We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2d13c2fd2bbc1164beca59490ca0f1c88c25a256) Merged-In: I441fde351191dfa28e48a54538249be57310971f Change-Id: I441fde351191dfa28e48a54538249be57310971f
Bug: 297918380 Change-Id: I934dc696c9066bdc337a4279296b91744d0b0382
based on pipit 68a0b4b411e8d23dfd966d24a5c35ea4ffb9d5f1 and cheetah 9acaa7507c23ffc7ca5f82a9579dd3a7c56af809 Bug: 206057564 Change-Id: Id59ed48d2a39c9a5a811c41157732914f3568d51