am 7a310fbb: keystore: fix upgrades

* commit '7a310fbb5815b3c1ad965d58f4976afca2a721c6':
  keystore: fix upgrades
tree: bcccc7411e3d1597b9fa8c71c85c92c8e33af1e3
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/