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

Change-Id: I7b9514d93252c8c54005632479690e0a9ac0705f