[DO NOT MERGE] Fix keychain key upgrade issue am: 58291e0ff3
am: aa1474b3e9  -s ours

Change-Id: I6881bad273783b5e4de6ad4985f41259394d6677
tree: 8786af8d58685c86e6112ef6c9cd64c231602071
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE