[jdk11u-dev] RFR: 8195589: T6587786.java failed after JDK-8189997

[Andrew Lu]

I backport this for parity with 11.0.21-oracle.

-------------

Commit messages:
 - Backport 21b62fef335aa981a239415532fa8b804fb5676d

Changes: https://git.openjdk.org/jdk11u-dev/pull/2126/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=2126&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8195589
  Stats: 11 lines in 2 files changed: 3 ins; 1 del; 7 mod
  Patch: https://git.openjdk.org/jdk11u-dev/pull/2126.diff
  Fetch: git fetch https://git.openjdk.org/jdk11u-dev.git pull/2126/head:pull/2126

PR: https://git.openjdk.org/jdk11u-dev/pull/2126