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

Change-Id: I7b9514d93252c8c54005632479690e0a9ac0705f
tree: ca96b410323aa44f652eddb70fc19c377ea10e6b
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE