Switch from add_lunch_combo to COMMON_LUNCH_CHOICES

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