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

Change-Id: Ic796c6fd3d623125ba29410ee5c23ceb2e586712