Merge "keystore: add upgradeKeyBlob call into keystore exportKey."