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

Change-Id: Ibbf58ffaa2f10d0bd20737f61d8abe1f9388e18a