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