Android 9.0.0 Release 16 (PQ1A.181105.017.A1)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW+C+MwAKCRDorT+BmrEO
eJayAJ40n+afOwcmP3LVve8REG+nIz/zMwCePV3c6uhne3nVl9zXtRi01Mek/Tg=
=viQV
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58