Switch from add_lunch_combo to COMMON_LUNCH_CHOICES

Bug: 77599627
Test: lunch  [see entries in list]
Change-Id: I9d0f6067b004744290756579a7d88f3e274ccabf
2 files changed