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

Change-Id: I68a91d6b9510a70f5ac4047d12630eef83f367c1