Fix temporary key deletion after device ID attestation
am: e0256a8dbb

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