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

Change-Id: Ie61232cc61d2e5f5d4e2aae450fb1ca49d1bbe59