Android 8.1.0 Release 50 (OPM7.181105.004)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW9OMqwAKCRDorT+BmrEO
eDnyAJ9iP4yuWX3pBU4KZPE//BK9bBcsTQCggHIK51rBSb2u1a6k50NrGeHt0rI=
=KjJF
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58