Android O MR1 IOT Release Smart Display r3 (OIM3.180907.022)
Remove obsolete __BRILLO__ flag am: bbe9a70a85
am: 87b492fdcd

Change-Id: Iab91b0c164b9a4c8700d9041ba01307f2d28c4f5