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

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