Merge "KeyMint manual key upgrade tests"