Merge "Reverted the ApnSetting behavior" am: 88b3357538 am: 53f21f4aae

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004910

Change-Id: I442a38e34358715cee1033f1a955cc0a474f163e

telephony/java/android/telephony/data/ApnSetting.java

@@ -2158,8 +2158,7 @@ public class ApnSetting implements Parcelable {
                     | TYPE_FOTA | TYPE_IMS | TYPE_CBS | TYPE_IA | TYPE_EMERGENCY | TYPE_MCX
                     | TYPE_XCAP | TYPE_VSIM | TYPE_BIP | TYPE_ENTERPRISE)) == 0
                 || TextUtils.isEmpty(mApnName) || TextUtils.isEmpty(mEntryName)) {
-                throw new IllegalArgumentException("mApName=" + mApnName + ", mEntryName="
-                        + mEntryName + ", mApnTypeBitmask=" + mApnTypeBitmask);
+                return null;
             }
             return new ApnSetting(this);
         }