Android n-iot-release-smart-display (NIT1.180611.004)
DO NOT MERGE: Merge Oreo MR1 into master

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