Android O MR1 IOT Release Smart Display r40.1J (OIMK.211005.001)
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I1d981307a81e23e95a0aa38f84b30ead35adf756