Fix DDMS-JDWP race am: f51d182c3d am: eb9ae68543 am: 083ec3543e am: c9bc2c6af7

Original change: https://android-review.googlesource.com/c/platform/art/+/1569323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I668f97221819ed9b31970e36521180eae07e02d6