am df6c6702: Merge "Streamline Android Keystore delete entry operation." into mnc-dev

* commit 'df6c67028a0341a5b05d5097e12ae4d0cbb69fa4':
  Streamline Android Keystore delete entry operation.