Android 8.1.0 release 21
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWsJ+jwAKCRDorT+BmrEO
eIfwAJ9N5BTRum75Gp9CP5LHGWUQY4rptACeO/wpbml5b42I8B1m8b3/8hzntj4=
=HNde
-----END PGP SIGNATURE-----
Merge cherrypicks of [3652403] into oc-m3-release

Change-Id: I38b14a18697f804277bd78c69c8a4b1749c71d4d