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

Change-Id: Ibdd727f0fb578d4c2b41d9374ca7acda69dffc70