Merge "keystore2: Add test for RKPD key upgrade"