Merge changes Ib164c294,Ie40c0226

* changes:
  Android patch: Disable OpenJDK 11 Duration tests
  Add java.time tests into EXPECTED_UPSTREAM - aosp/master