Merge "Revert "Remove outdated emulator check which causes BT to not start""
am: 375ea2ae71

Change-Id: I3d5abc52abf3f7c01ba4fbee47d7e487e99f5dda