Android 9.0.0 Release 6 (PPR2.180905.005)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW4BZXgAKCRDorT+BmrEO
eGx0AJ4tFeH2LlFtoM15qRjDQ+bI+3+19QCgi4EIUKb1gu/5ouHldki5sKVz+tc=
=PSYn
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58