Android O MR1 Preview 2 (OPP6.171019.012)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWiiQiQAKCRDorT+BmrEO
eLqBAJ43jnE0O89JYJTSzVEANt4hjmkQDACgkFO2JSpdNol87ODulaI4R7DDJ38=
=svXX
-----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