Android O MR1 IOT Release Smart Display r5 (OIM4.181017.001.A7)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXBYMLwAKCRDorT+BmrEO
eDFSAJ4ya9yIjk1fqEGL+lYLCG3hPO4jSACeLO6MDWANi2WXPysohY9+JU3Z0Bs=
=VXVH
-----END PGP SIGNATURE-----
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 322a1f7ce1  -s ours am: d110769efd
am: da8b088e90  -s ours

Change-Id: I2036cb320ddeff2e3131fb8def53101753e3b035