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

Change-Id: I5b8ac2016ef8b05aaf91a0bf051b2a0d15bc91d4