Merge "keystore2: Add timeout to RKPD get key call"