Android O MR1 IOT Release Smart Display r40.1J (OIMK.211005.001)
Merge "Reland "Add columns for color aspects to database"""