Android 9.0.0 release 12
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW8fEAwAKCRDorT+BmrEO
eG2PAJ0RjPdFvq4ZBfvl0Tg6xQmVvbFi8wCfRNh/5lA8LxHv50VRctYjBGAI2W8=
=44ip
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58