Android 9.0.0 Release 30 (PQ1A.190105.004)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXDOklAAKCRDorT+BmrEO
eCW8AJ4r80+UGjORig+M+yBTpnXbhyj78gCeOOJYuWdbb/2kBPWsTu4L8Bkzfyw=
=u4Nt
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58