Merge changes I1f1a0c96,Ib2064ecf into expected_upstream

* changes:
  Merge branch jdk-11+28 NoSuchMethodException into expected_upstream
  Import java.lang.NoSuchMethodException from jdk-11+28
tree: 0e0171b5d465ff332e304476ac04db3643038d07
  1. ojluni/