Merge "Keystore 2.0: Fix loading of unencrypted legacy super keys."