Merge changes I471014c1,I5365c4da into main

* changes:
  Handle ICMP in testRequestIpSecTransformStateForTx
  Add awaitEspPacket that requires sequence number match