Merge "Add missing coverage for newly-added KeyStore APIs."