Android O MR1 IOT Release Smart Display r22 (OIMG.191202.005)
Switch from add_lunch_combo to COMMON_LUNCH_CHOICES

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