Merge "Replace android_color_mode usage with ColorMode." into pi-dev am: 0cb97d5501
am: e3157de750

Change-Id: Ifaad16427ed79f68f6fe21602c7c79cd85395f67