Merge changes from topic "revert-1849420-openjdk11-j-u-c-merge-GXXAALPPMY" am: 9102fe0012 am: cd376c4951 am: 3a1c42c7e5 am: 3be904db11

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1856405

Change-Id: I7783acdc4ff911078272fa9c2730026d04e13ad4