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

Change-Id: Ief069b65536c4c4a204567bba513de76d78c8448