Android 9.0.0 Release 7 (PPR2.180905.006)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW4BaVwAKCRDorT+BmrEO
eLJyAJ93uLQA94SnMVzAwhmHpiu9/QloBQCggHb3kghnXE87hZbKKtcN/KCS/14=
=/J79
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58