diff --git a/core/java/android/view/inputmethod/InputMethodSubtype.java b/core/java/android/view/inputmethod/InputMethodSubtype.java
index e73e7a358b61b..b0b94605f4084 100644
--- a/core/java/android/view/inputmethod/InputMethodSubtype.java
+++ b/core/java/android/view/inputmethod/InputMethodSubtype.java
@@ -536,14 +536,7 @@ public final class InputMethodSubtype implements Parcelable {
         if (!TextUtils.equals(getMode(), SUBTYPE_MODE_KEYBOARD)) {
             return false;
         }
-        if (isAuxiliary()) {
-            return false;
-        }
-        final String langTag = getCanonicalizedLanguageTag();
-        if (langTag.isEmpty() || TextUtils.equals(langTag, UNDEFINED_LANGUAGE_TAG)) {
-            return false;
-        }
-        return true;
+        return !isAuxiliary();
     }
 
     /**
diff --git a/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java b/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java
index 297b07fac3404..5095cad1b6078 100644
--- a/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java
+++ b/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java
@@ -176,14 +176,6 @@ public class InputMethodSubtypeTest {
         // Auxiliary subtype not suitable.
         assertFalse(getValidBuilder.get().setIsAuxiliary(true).build()
                 .isSuitableForPhysicalKeyboardLayoutMapping());
-
-        // languageTag == null is not suitable.
-        assertFalse(getValidBuilder.get().setLanguageTag(null).build()
-                .isSuitableForPhysicalKeyboardLayoutMapping());
-
-        // languageTag == "und" is not suitable.
-        assertFalse(getValidBuilder.get().setLanguageTag("und").build()
-                .isSuitableForPhysicalKeyboardLayoutMapping());
     }
 
     private static InputMethodSubtype cloneViaParcel(final InputMethodSubtype original) {