Switch from add_lunch_combo to COMMON_LUNCH_CHOICES

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