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

Change-Id: I832947329ecfda9c2b1811de9ce817a21583f821