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

Change-Id: I74e52d89c2213761271676a9b0aef132c8e65cf3