Android O MR1 IOT Release Smart Display r4 (OIM3.180907.038)
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I4270e946f16c846538b610437c10d306eaa26415