Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"