Android O MR1 IOT Release Smart Display r22 (OIMG.191202.005)
Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES" am: 078cbd03b2
am: 8dcbe38434

Change-Id: Ia52568e4f03ece7a800c81c54207819063d41546