Switch from add_lunch_combo to COMMON_LUNCH_CHOICES Bug: 77599627 Test: lunch [see entries in list] Change-Id: I796da785e9fb6777ecd5fcc98628653d4c2e2486