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