Switch from add_lunch_combo to COMMON_LUNCH_CHOICES

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