Merge "Remove deprecated android.security.KeyStore methods." into mnc-dev