Android O MR1 IOT Release Smart Display r5 (OIM4.181017.001.A7)
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I26b14bc9175bf07d6dd3b7505a9876927aaf62e1