Android 9.0.0 release 21
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXAVtqQAKCRDorT+BmrEO
eEqNAJ9vUXoOvuv3woBeNyF6JByZn3r7WwCfa2EycTmL7AbcojW1WqS7TrZdrQo=
=NNdx
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58