Android O MR1 Preview 1
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWiHPzgAKCRDorT+BmrEO
eLtEAJ0SIbEhC9olb6wCpVAYwd38S+loRQCffsUIdbfnx7SokMYhPieeambhN/Q=
=plkH
-----END PGP SIGNATURE-----
resolve merge conflicts of 3dd3a1ed to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I30a520d82d87757ea7c8ac75de70f28d89f33939