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

Change-Id: I7cf7ca66047d07804e9b5291c780486132aae0a4