Merge "Reverted the ApnSetting behavior"

                    | 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);

        }