Android 9.0.0 Release 18 (PPR2.181005.003.A1)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW+oq5gAKCRDorT+BmrEO
eNdDAKCSZg61ya2Q9Y49vqGW/MqbZn6oIgCfUvc98q29tFMBZBn0phePsCIVH+c=
=355D
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58