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

Change-Id: I1e51bd88114a7d29a4ccdfc453b78ab68e5cbb9e