OpenJDK11: merge java.security.Keystore classes.

This is part of upgrading to OpenJDK 11.0.13. This adds some new APIs that are tested by the merged tests or will be tested by later updates.

Bug: 214203951
Test: m
Change-Id: I5af14574e0babdf250dd34a1e67830bad55f5d8e
8 files changed