Android O MR1 IOT Release Smart Display r4 (OIM3.180907.038)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW/RQcQAKCRDorT+BmrEO
eOufAJ9yEjVVj515bcZZvVEqdwuup7YIPwCfSesncQa+Fc40p3RZqhiOlmXJpcw=
=TYZZ
-----END PGP SIGNATURE-----
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0