Android p preview 2
Switch from add_lunch_combo to COMMON_LUNCH_CHOICES

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