Switch from add_lunch_combo to COMMON_LUNCH_CHOICES.

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