Android 9.0.0 Release 1 (PPR1.180610.009)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW1eTwQAKCRDorT+BmrEO
eOtCAJ0XFMNRORYr5X4Ykgyi4FcgSOsKHwCeIpKW+K0f6rSUtWOCtTJeT/DdUPg=
=SCgC
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58