[DO NOT MERGE] Fix keychain key upgrade issue
am: 58291e0ff3

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