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

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXBYMZAAKCRDorT+BmrEO
eI5xAJ99RIohtclMm9YNKdOOpBRo7EBOMACfTfVDRuaeLrC1ky95hxCWrUqS3ho=
=Nx5n
-----END PGP SIGNATURE-----
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0