Merge "Add test for DDMS racing with JDWP handshake" am: 505cd86caf am: 4024fc887b

Original change: https://android-review.googlesource.com/c/platform/cts/+/1569103

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84620580d0328c904bed89779d5b38a56be592e5