Cherry pick 2 more patches from the upstream

source/i18n/uspoof.cpp

Index: source/i18n/uspoof.cpp
diff --git a/source/i18n/uspoof.cpp b/source/i18n/uspoof.cpp
index 9cb41e2c9f7eba04b0c533745e2d105e17fe51d2..febaddc94994fcef84e53f5af2690dbd174da65e 100644
--- a/source/i18n/uspoof.cpp
+++ b/source/i18n/uspoof.cpp
@@ -646,13 +646,6 @@ uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
         return dest;
     }
 
-    // Check that at least one of the CONFUSABLE flags is turned on.  If not,
-    // return an error.
-    if ((This->fChecks & USPOOF_CONFUSABLE) == 0) {
-        *status = U_ILLEGAL_ARGUMENT_ERROR;
-        return dest;
-    }
-
     UnicodeString nfdId;
     gNfdNormalizer->normalize(id, nfdId, *status);