Merge "Remove obsolete code in BluetoothEventMangaer"