Support SPN/PNN as MNVO type in APN settings

Issue: FP4-1630
Issue: FP4-INT#11
Issue: FP4-INT#13
Change-Id: I79f241e0ed86b91ca8d38e342d94b0152ec24cd2
Depends-On: Ic296a62fab2d76a3303f72cdfd5bda383739a374
(cherry picked from commit fb841393819c64773d028fa10d1b7bcd4b9709f1)
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index eda1d69..67e0875 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -8360,7 +8360,7 @@
             Log.d(LOG_TAG, "isMvnoMatched# IccRecords is null");
             return false;
         }
-        return ApnSettingUtils.mvnoMatches(iccRecords, mvnoType, mvnoMatchData);
+        return ApnSettingUtils.mvnoMatches(iccRecords, mvnoType, mvnoMatchData, subId);
     }
 
     @Override