Merge "Update expectations for a couple of jdwp cts tests" into main