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

Change-Id: I57441157c981e708dea99370480f0802a81a90d2