Merge "dx-tests: fixes and suppressions following java 11 switch" am: 06ee287673 am: 4038b63464 am: 3a1bbea144

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1956098

Change-Id: I548f60f07febdb61a5b86aa4e8b1634e8abb2a1f