Android 9.0.0 Release 34 (PQ2A.190305.002)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXHcLxwAKCRDorT+BmrEO
eJMHAJ4qvMEDMg5/vZzavos2unTIXnXmlwCcCQzTmekXUIveMgA9UB5NHwtJCR0=
=CCqb
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58