Switch from add_lunch_combo to COMMON_LUNCH_CHOICES

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