Android O MR1 IOT Release Smart Display r22 (OIMG.191202.005)
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I74559e5cfdc3dc3d45ca1a1a8a434ebac95a7bd4