Merge "Bluetooth HIDD: Remove unplug()" am: 18aa649b8f
am: d8ae68626f

Change-Id: Iacdbc31172e87621127d66e8214307a14ab76499