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

Change-Id: I037b6aac4b72dab494699fb8b69fbd3d00e9d0e0
tree: b048f6a9e8bb5c0861a0f8836d402e6e4c21f2fc
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE