Merge "Revert "Bluetooth: Enable Bluetooth HID for Bluedroid""