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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d85ea00a4d090af1549898f5ab042ef329053db