Merge correct version of hamiltonian_gate fix

Author: wshanks

test/library/characterization/test_cross_resonance_hamiltonian.py

@@ -22,11 +22,12 @@
 from qiskit import QuantumCircuit, pulse, qpy, quantum_info as qi
 from qiskit.providers.fake_provider import FakeBogotaV2
 
+# TODO: remove old path after we stop supporting the relevant version of Qiskit
 try:
     from qiskit.circuit.library.hamiltonian_gate import HamiltonianGate
 except ImportError:
-    # Remove this when dropping support for testing against qiskit<1.0
     from qiskit.extensions.hamiltonian_gate import HamiltonianGate
+
 from qiskit_aer import AerSimulator
 from qiskit_experiments.library.characterization import cr_hamiltonian