Android Wear 8.0.0 Release 2 (OWDS.181106.001)
Switch from add_lunch_combo to COMMON_LUNCH_CHOICES am: 2ced84e28c
am: 43c68cca08

Change-Id: I6341a922766eb726d5bcca57bf380d840b4becf6