Merge "Remove the obsolete field android.security.KeyStore.NO_ERROR" into main