Android 8.1.0 Release 17 (OPM3.171019.016)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWp25kgAKCRDorT+BmrEO
eMr6AJ9vM4zoQBdE+Q/3GShTctQUbbhdrgCfRodonNBszihXFZtPmtQ/U7VzVxU=
=mFxx
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58