Merge "BT: Remove dead code in BluetoothHeadset"
am: ea7363402c

Change-Id: I5ee5d55d3c47fc82698d80610a2bd70cdee794f8