Android O MR1 IOT Release Smart Display r5 (OIM4.181017.001.A7)
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: Ic5e4b28cff23e58595f9e3c0cc046ad366fd78ee