[DO NOT MERGE] Fix keychain key upgrade issue
am: 7593bbf15a

Change-Id: Id3cf379aad3fc6475a737bf5ebc92549075d18fa
tree: 11bbea0acf1e4738ec0e4b516459b3d00b0368f3
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE