8281388: Change wrapping of EncryptedPrivateKeyInfo Reviewed-by: mbaesken Backport-of: 405381ce9b44c8b122a06e590e4d8240fd9ba996