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

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