merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206aa6957c
tree: 48659ab99c88764bcf3c7898ff2829baf4f033c0
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/