Android 8.1.0 Release 18 (OPM5.171019.017)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWp290wAKCRDorT+BmrEO
eGk6AJ9XFsVkXXz89tKpBwgocHTwgISU9gCeNhU4EBYmSgVRcBhvFY8Mr3BVRqs=
=LI3S
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58