am b913aa57: Merge "Abort operation pruning only if it fails to make space." into mnc-dev

* commit 'b913aa5774c96fae83afe3dd1935394f0edcaaa9':
  Abort operation pruning only if it fails to make space.
tree: 0fcff2c3faef900d8ba5377a3b106e4e4a3aa627
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/