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

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