Switch from add_lunch_combo to COMMON_LUNCH_CHOICES

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