Merge "Fix getApnTypesBitmaskFromString in ApnSetting"