Android 9.0.0 Release 17 (PPR1.181005.003.A1)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW+olGwAKCRDorT+BmrEO
eNraAJ4oP1Kr2FZZSq8LX4o/0mjDk6cYBgCeMke+7FU0beMedhmaLpxcKgHz9y8=
=Geh6
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58