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: Ief069b65536c4c4a204567bba513de76d78c8448