Android 8.1.0 Release 61 (OPM8.190205.001)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXFi6WQAKCRDorT+BmrEO
eKl1AJ4wAckb+9sXibMKXd+kCFwfXuDOAQCcCmbNJtNSMKnB66PdVswrGw2E+L8=
=MtVZ
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58