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

Change-Id: Ia9b352605d186d33f99304be496c5c629b7e5173