Android O MR1 IOT Release Smart Display r22 (OIMG.191202.005)
DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I0a31d2578a1cf8fdee902176bf25d9fa0342d74a