Merge "Fix temporary key deletion after device ID attestation" into oc-dev
am: 211dcefb77

Change-Id: Ib6df73d19437e05c9cc4054438d9373df6fc9608
tree: 44c61f28f0d8229954c0e450e2ee72ae17af3c99
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE