Keystore 2.0: Fix version binding for user generated attestation keys.

User generated attestation keys need to be upgraded on firmware version
bump.

This also fixes keystore 2 panicking when user generated attestation
keys are used.

Bug: 183220507
Test: Oh well.
Change-Id: Ib0adcc3bdd20d8e46ef4283f8834b74485d5d37a
4 files changed