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

* commit '28d99c2419d0b8f472fe45bb31d1ffbde61145e0':
  Streamline Android Keystore delete entry operation.