keystore: add upgradeKeyBlob call into keystore exportKey. am: 2c1423111a
am: 0b9a63f96f

Change-Id: Id5314506d56d978e0c4c79b3aadb90b24aab6452