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

Change-Id: Ibb6a0c3e4b887ebce0f6bbfea956fa63f23fc2b1