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