Merge "Fix test assumption for KeyMint+RKP integration"