Android O MR1 IOT Release Smart Display r3 (OIM3.180907.022)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW9DwTQAKCRDorT+BmrEO
ePtQAJoD5IwvMO5BgkZJqjdq+WbOo31IfACfc9Tr2hjzPX+ze1LFLZPHsp1MrFo=
=BWnX
-----END PGP SIGNATURE-----
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0