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

Change-Id: I93ba53e4cf31e6dfc6e98d70cd73a93ec930ccb1