Fix temporary key deletion after device ID attestation am: e0256a8dbb
am: abedb78775

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