Android O MR1 IOT Release Smart Display r5 (OIM4.181017.001.A7)
Merge Android Pie into master am: ea6533a4d4
am: 11769a8584

Change-Id: I7e7edac95a266bcdb5ef23b13ee7dc80abb3d06a