Bug: 31016523 Test: mm run-jdwp-tests-ri & mm run-jdwp-tests-host (cherry-picked from commit 3bb30d93) Change-Id: I2aa1083b914fd35b5abebae4aa07f85c73d83acf