Android 9.0.0 Release 31 (PQ2A.190205.001)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXFi/hQAKCRDorT+BmrEO
ePmJAJ9tWfhCO3/fltnduvKkiuhKL8bT7gCfeFCVAESHQPfRc94YxF1Ecg3s2oQ=
=yxMz
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58