[DO NOT MERGE] Fix keychain key upgrade issue am: 7593bbf15a am: c06ec2348a am: 1ed3e156c3  -s ours am: 0d3e006ed8  -s ours
am: 383607b113  -s ours

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