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

Change-Id: I45ea735f8a90f515ff2fa5dfc1fa63fd4f3cb817