Android O MR1 IOT Release Smart Display r5 (OIM4.181017.001.A7)
Merge "Merge Android Pie into master" am: 579f7d5cd1
am: 3d630ec597

Change-Id: I95c6ad04f3509351f2b48eb8f33da5dfc5ed29be