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

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